diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 18:11:46 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 18:11:53 -0400 |
| commit | 5839fec9d8db35b2b07359b18a77295418e239ad (patch) | |
| tree | f060f613c7d76b2784a93c96b7b8cd3f0d201254 /arch/arm/mach-imx/mach-mx31moboard.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-mx31moboard.c')
| -rw-r--r-- | arch/arm/mach-imx/mach-mx31moboard.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mach-mx31moboard.c b/arch/arm/mach-imx/mach-mx31moboard.c index b358383120e7..1d01ef28f25d 100644 --- a/arch/arm/mach-imx/mach-mx31moboard.c +++ b/arch/arm/mach-imx/mach-mx31moboard.c | |||
| @@ -567,7 +567,7 @@ static void __init mx31moboard_reserve(void) | |||
| 567 | 567 | ||
| 568 | MACHINE_START(MX31MOBOARD, "EPFL Mobots mx31moboard") | 568 | MACHINE_START(MX31MOBOARD, "EPFL Mobots mx31moboard") |
| 569 | /* Maintainer: Valentin Longchamp, EPFL Mobots group */ | 569 | /* Maintainer: Valentin Longchamp, EPFL Mobots group */ |
| 570 | .boot_params = MX3x_PHYS_OFFSET + 0x100, | 570 | .atag_offset = 0x100, |
| 571 | .reserve = mx31moboard_reserve, | 571 | .reserve = mx31moboard_reserve, |
| 572 | .map_io = mx31_map_io, | 572 | .map_io = mx31_map_io, |
| 573 | .init_early = imx31_init_early, | 573 | .init_early = imx31_init_early, |