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-armadillo5x0.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-armadillo5x0.c')
| -rw-r--r-- | arch/arm/mach-imx/mach-armadillo5x0.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mach-armadillo5x0.c b/arch/arm/mach-imx/mach-armadillo5x0.c index ede2710f8b76..215259083945 100644 --- a/arch/arm/mach-imx/mach-armadillo5x0.c +++ b/arch/arm/mach-imx/mach-armadillo5x0.c | |||
| @@ -558,7 +558,7 @@ static struct sys_timer armadillo5x0_timer = { | |||
| 558 | 558 | ||
| 559 | MACHINE_START(ARMADILLO5X0, "Armadillo-500") | 559 | MACHINE_START(ARMADILLO5X0, "Armadillo-500") |
| 560 | /* Maintainer: Alberto Panizzo */ | 560 | /* Maintainer: Alberto Panizzo */ |
| 561 | .boot_params = MX3x_PHYS_OFFSET + 0x100, | 561 | .atag_offset = 0x100, |
| 562 | .map_io = mx31_map_io, | 562 | .map_io = mx31_map_io, |
| 563 | .init_early = imx31_init_early, | 563 | .init_early = imx31_init_early, |
| 564 | .init_irq = mx31_init_irq, | 564 | .init_irq = mx31_init_irq, |