diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 23:11:46 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-11-01 00:25:01 +0100 |
| commit | 5725aeae5ff2e39f3815bbef788ee326c9afea2c (patch) | |
| tree | 4f32f936ba18384d48ab1e537b787a8ce666263f /arch/arm/mach-pxa/palmtreo.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-pxa/palmtreo.c')
| -rw-r--r-- | arch/arm/mach-pxa/palmtreo.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/palmtreo.c b/arch/arm/mach-pxa/palmtreo.c index 30364b0af90..94e9708b349 100644 --- a/arch/arm/mach-pxa/palmtreo.c +++ b/arch/arm/mach-pxa/palmtreo.c @@ -445,7 +445,7 @@ static void __init centro_init(void) #ifdef CONFIG_MACH_TREO680 MACHINE_START(TREO680, "Palm Treo 680") - .boot_params = 0xa0000100, + .atag_offset = 0x100, .map_io = pxa27x_map_io, .reserve = treo_reserve, .init_irq = pxa27x_init_irq, @@ -457,7 +457,7 @@ MACHINE_END #ifdef CONFIG_MACH_CENTRO MACHINE_START(CENTRO, "Palm Centro 685") - .boot_params = 0xa0000100, + .atag_offset = 0x100, .map_io = pxa27x_map_io, .reserve = treo_reserve, .init_irq = pxa27x_init_irq, |