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/palmt5.c | |
| parent | Merge branch 'depends/rmk/gpio' into next/fixes (diff) | |
| parent | ARM: switch from NO_MACH_MEMORY_H to NEED_MACH_MEMORY_H (diff) | |
| download | linux-5725aeae5ff2e39f3815bbef788ee326c9afea2c.tar.xz linux-5725aeae5ff2e39f3815bbef788ee326c9afea2c.zip | |
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/palmt5.c')
| -rw-r--r-- | arch/arm/mach-pxa/palmt5.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/palmt5.c b/arch/arm/mach-pxa/palmt5.c index 9bd3e47486fb..99d6bcf1f974 100644 --- a/arch/arm/mach-pxa/palmt5.c +++ b/arch/arm/mach-pxa/palmt5.c @@ -202,7 +202,7 @@ static void __init palmt5_init(void) } MACHINE_START(PALMT5, "Palm Tungsten|T5") - .boot_params = 0xa0000100, + .atag_offset = 0x100, .map_io = pxa27x_map_io, .reserve = palmt5_reserve, .init_irq = pxa27x_init_irq, |