aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-imx/mach-mx21ads.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-06-07 14:59:28 -0700
committerOlof Johansson <olof@lixom.net>2012-06-07 14:59:28 -0700
commit6f4b3bf5dc0edb5b08d96486f35f5cbc24b72c40 (patch)
tree4277ede78d08047ab1ab92cda179da7e40a357a7 /arch/arm/mach-imx/mach-mx21ads.c
parent434978e678605c8370d3d71e88796c264f70a8bf (diff)
parent350ab15bb2ffe7103bc6bf6c634f3c5b286eaf2a (diff)
Merge branch 'imx/fixes' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes
* 'imx/fixes' of git://git.pengutronix.de/git/imx/linux-2.6: ARM i.MX imx21ads: Fix overlapping static i/o mappings ARM i.MX27 Visstrim M10: fix gpio handling. ARM: imx: only call l2x0_init if it's available ARM: imx: only specify i2c device type once ARM: mx31_3ds: Fix build due to missing IMX_HAVE_PLATFORM_IMX_SSI
Diffstat (limited to 'arch/arm/mach-imx/mach-mx21ads.c')
-rw-r--r--arch/arm/mach-imx/mach-mx21ads.c2
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 d14bbe949a4..3e7401fca76 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))