diff options
| author | Todd Poynor <toddpoynor@google.com> | 2013-01-16 12:57:27 -0800 |
|---|---|---|
| committer | Todd Poynor <toddpoynor@google.com> | 2013-01-16 12:58:11 -0800 |
| commit | 725f5f801458bda3b664686dea6127650829a5af (patch) | |
| tree | 9dca5675ff93755fb87ffc99cffe95e96c17bac9 /arch/arm/mach-imx | |
| parent | e687119f9ec43837ad610d41574dbda473355a1e (diff) | |
| parent | fbad46f30d0ccb24fcadf4fa129d917fd0bfa1fe (diff) | |
| download | kernel_samsung_tuna-725f5f801458bda3b664686dea6127650829a5af.zip kernel_samsung_tuna-725f5f801458bda3b664686dea6127650829a5af.tar.gz kernel_samsung_tuna-725f5f801458bda3b664686dea6127650829a5af.tar.bz2 | |
Merge branch 'android-3.0' into android-omap-3.0
Fixup incompatible code in opp.c: omap_init_opp_table()
Change-Id: Iac7d60b814a539285d00e0a3dbb6e3f0060cb683
Signed-off-by: Todd Poynor <toddpoynor@google.com>
Diffstat (limited to 'arch/arm/mach-imx')
| -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 74ac889..a37fe02 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)) |