diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 09:23:28 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 09:23:28 -0400 |
| commit | 929f58aeeb46f964d9468ce1addd993f5d92b11d (patch) | |
| tree | 95355731bd4d21d221cdc2a5ab073244ff76db65 /arch/arm/mach-pxa/xcep.c | |
| parent | fcd467137ea2da46ffe5cbfdb42e8a2b35f13dad (diff) | |
| parent | a26bce1220a4c5a7a074a779e6aad3cae63a94f7 (diff) | |
Merge branch 'depends/rmk/devel-stable' into imx/imx6q
Diffstat (limited to 'arch/arm/mach-pxa/xcep.c')
| -rw-r--r-- | arch/arm/mach-pxa/xcep.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/xcep.c b/arch/arm/mach-pxa/xcep.c index acc600f5e72f..54930cccbe54 100644 --- a/arch/arm/mach-pxa/xcep.c +++ b/arch/arm/mach-pxa/xcep.c | |||
| @@ -180,7 +180,7 @@ static void __init xcep_init(void) | |||
| 180 | } | 180 | } |
| 181 | 181 | ||
| 182 | MACHINE_START(XCEP, "Iskratel XCEP") | 182 | MACHINE_START(XCEP, "Iskratel XCEP") |
| 183 | .boot_params = 0xa0000100, | 183 | .atag_offset = 0x100, |
| 184 | .init_machine = xcep_init, | 184 | .init_machine = xcep_init, |
| 185 | .map_io = pxa25x_map_io, | 185 | .map_io = pxa25x_map_io, |
| 186 | .init_irq = pxa25x_init_irq, | 186 | .init_irq = pxa25x_init_irq, |