diff options
| author | KalimochoAz <calimochoazucarado@gmail.com> | 2012-06-24 20:47:33 +0200 |
|---|---|---|
| committer | KalimochoAz <calimochoazucarado@gmail.com> | 2012-06-24 20:47:33 +0200 |
| commit | 632456bcbac1cacb988883c915174cf841a883f8 (patch) | |
| tree | 028d4f23f1eb505fc8e64338ab4d12c1c995166c /arch/arm | |
| parent | 206f021b91066de1406a9a657237968dfea6b746 (diff) | |
| parent | c0bd4b6a0c6c0d42235920fb7ddd7110c86e2adb (diff) | |
| download | kernel_samsung_crespo-632456bcbac1cacb988883c915174cf841a883f8.tar.gz kernel_samsung_crespo-632456bcbac1cacb988883c915174cf841a883f8.tar.bz2 kernel_samsung_crespo-632456bcbac1cacb988883c915174cf841a883f8.zip | |
Merge branch 'linux-3.0.y' into HEAD
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-imx/mach-mx21ads.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mach-mx21ads.c b/arch/arm/mach-imx/mach-mx21ads.c index 74ac88978dd..a37fe021d69 100644 --- a/arch/arm/mach-imx/mach-mx21ads.c +++ b/arch/arm/mach-imx/mach-mx21ads.c @@ -32,7 +32,7 @@ * Memory-mapped I/O on MX21ADS base board */ #define MX21ADS_MMIO_BASE_ADDR 0xf5000000 -#define MX21ADS_MMIO_SIZE SZ_16M +#define MX21ADS_MMIO_SIZE 0xc00000 #define MX21ADS_REG_ADDR(offset) (void __force __iomem *) \ (MX21ADS_MMIO_BASE_ADDR + (offset)) |