diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 14:23:28 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 14:23:28 +0100 |
| commit | 929f58aeeb46f964d9468ce1addd993f5d92b11d (patch) | |
| tree | 95355731bd4d21d221cdc2a5ab073244ff76db65 /arch/arm/mach-pxa/palmld.c | |
| parent | fcd467137ea2da46ffe5cbfdb42e8a2b35f13dad (diff) | |
| parent | a26bce1220a4c5a7a074a779e6aad3cae63a94f7 (diff) | |
Merge branch 'depends/rmk/devel-stable' into imx/imx6q
Diffstat (limited to 'arch/arm/mach-pxa/palmld.c')
| -rw-r--r-- | arch/arm/mach-pxa/palmld.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/palmld.c b/arch/arm/mach-pxa/palmld.c index 6b77365ed93..3d4a2819cae 100644 --- a/arch/arm/mach-pxa/palmld.c +++ b/arch/arm/mach-pxa/palmld.c @@ -342,7 +342,7 @@ static void __init palmld_init(void) } MACHINE_START(PALMLD, "Palm LifeDrive") - .boot_params = 0xa0000100, + .atag_offset = 0x100, .map_io = palmld_map_io, .init_irq = pxa27x_init_irq, .handle_irq = pxa27x_handle_irq, |