diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-11-01 02:11:46 +0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-11-01 03:25:01 +0400 |
commit | 5725aeae5ff2e39f3815bbef788ee326c9afea2c (patch) | |
tree | 4f32f936ba18384d48ab1e537b787a8ce666263f /arch/arm/mach-pxa/balloon3.c | |
parent | 43872fa788060eef91ae437957e0a5e39f1c56fd (diff) | |
parent | 0cdc8b921d68817b687755b4f6ae20cd8ff1d026 (diff) | |
download | linux-5725aeae5ff2e39f3815bbef788ee326c9afea2c.tar.xz |
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-pxa/balloon3.c')
-rw-r--r-- | arch/arm/mach-pxa/balloon3.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/balloon3.c b/arch/arm/mach-pxa/balloon3.c index d0f141162171..fc0b8544e174 100644 --- a/arch/arm/mach-pxa/balloon3.c +++ b/arch/arm/mach-pxa/balloon3.c @@ -828,5 +828,5 @@ MACHINE_START(BALLOON3, "Balloon3") .handle_irq = pxa27x_handle_irq, .timer = &pxa_timer, .init_machine = balloon3_init, - .boot_params = PLAT_PHYS_OFFSET + 0x100, + .atag_offset = 0x100, MACHINE_END |