diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 18:11:46 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 19:25:01 -0400 |
| commit | 5725aeae5ff2e39f3815bbef788ee326c9afea2c (patch) | |
| tree | 4f32f936ba18384d48ab1e537b787a8ce666263f /arch/arm/mach-imx/mach-mx27ads.c | |
| parent | 43872fa788060eef91ae437957e0a5e39f1c56fd (diff) | |
| parent | 0cdc8b921d68817b687755b4f6ae20cd8ff1d026 (diff) | |
Merge branch 'depends/rmk/memory_h' into next/fixes
Fix up all conflicts between the memory.h cleanup and bug fixes.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-imx/mach-mx27ads.c')
| -rw-r--r-- | arch/arm/mach-imx/mach-mx27ads.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mach-mx27ads.c b/arch/arm/mach-imx/mach-mx27ads.c index e1addc1a5813..635b0509068b 100644 --- a/arch/arm/mach-imx/mach-mx27ads.c +++ b/arch/arm/mach-imx/mach-mx27ads.c | |||
| @@ -344,7 +344,7 @@ static void __init mx27ads_map_io(void) | |||
| 344 | 344 | ||
| 345 | MACHINE_START(MX27ADS, "Freescale i.MX27ADS") | 345 | MACHINE_START(MX27ADS, "Freescale i.MX27ADS") |
| 346 | /* maintainer: Freescale Semiconductor, Inc. */ | 346 | /* maintainer: Freescale Semiconductor, Inc. */ |
| 347 | .boot_params = MX27_PHYS_OFFSET + 0x100, | 347 | .atag_offset = 0x100, |
| 348 | .map_io = mx27ads_map_io, | 348 | .map_io = mx27ads_map_io, |
| 349 | .init_early = imx27_init_early, | 349 | .init_early = imx27_init_early, |
| 350 | .init_irq = mx27_init_irq, | 350 | .init_irq = mx27_init_irq, |