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-mx31_3ds.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-mx31_3ds.c')
| -rw-r--r-- | arch/arm/mach-imx/mach-mx31_3ds.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mach-mx31_3ds.c b/arch/arm/mach-imx/mach-mx31_3ds.c index 5750ca55c1f7..712a7fb1cf01 100644 --- a/arch/arm/mach-imx/mach-mx31_3ds.c +++ b/arch/arm/mach-imx/mach-mx31_3ds.c | |||
| @@ -764,7 +764,7 @@ static void __init mx31_3ds_reserve(void) | |||
| 764 | 764 | ||
| 765 | MACHINE_START(MX31_3DS, "Freescale MX31PDK (3DS)") | 765 | MACHINE_START(MX31_3DS, "Freescale MX31PDK (3DS)") |
| 766 | /* Maintainer: Freescale Semiconductor, Inc. */ | 766 | /* Maintainer: Freescale Semiconductor, Inc. */ |
| 767 | .boot_params = MX3x_PHYS_OFFSET + 0x100, | 767 | .atag_offset = 0x100, |
| 768 | .map_io = mx31_map_io, | 768 | .map_io = mx31_map_io, |
| 769 | .init_early = imx31_init_early, | 769 | .init_early = imx31_init_early, |
| 770 | .init_irq = mx31_init_irq, | 770 | .init_irq = mx31_init_irq, |