diff options
| author | Olof Johansson <olof@lixom.net> | 2012-06-07 17:59:28 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-06-07 17:59:28 -0400 |
| commit | 6f4b3bf5dc0edb5b08d96486f35f5cbc24b72c40 (patch) | |
| tree | 4277ede78d08047ab1ab92cda179da7e40a357a7 /arch/arm/mach-imx/mach-mx21ads.c | |
| parent | 434978e678605c8370d3d71e88796c264f70a8bf (diff) | |
| parent | 350ab15bb2ffe7103bc6bf6c634f3c5b286eaf2a (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.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 d14bbe949a4f..3e7401fca76c 100644 --- a/arch/arm/mach-imx/mach-mx21ads.c +++ b/arch/arm/mach-imx/mach-mx21ads.c | |||
| @@ -32,7 +32,7 @@ | |||
| 32 | * Memory-mapped I/O on MX21ADS base board | 32 | * Memory-mapped I/O on MX21ADS base board |
| 33 | */ | 33 | */ |
| 34 | #define MX21ADS_MMIO_BASE_ADDR 0xf5000000 | 34 | #define MX21ADS_MMIO_BASE_ADDR 0xf5000000 |
| 35 | #define MX21ADS_MMIO_SIZE SZ_16M | 35 | #define MX21ADS_MMIO_SIZE 0xc00000 |
| 36 | 36 | ||
| 37 | #define MX21ADS_REG_ADDR(offset) (void __force __iomem *) \ | 37 | #define MX21ADS_REG_ADDR(offset) (void __force __iomem *) \ |
| 38 | (MX21ADS_MMIO_BASE_ADDR + (offset)) | 38 | (MX21ADS_MMIO_BASE_ADDR + (offset)) |