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-imx/mach-mx35_3ds.c | |
| parent | fcd467137ea2da46ffe5cbfdb42e8a2b35f13dad (diff) | |
| parent | a26bce1220a4c5a7a074a779e6aad3cae63a94f7 (diff) | |
Merge branch 'depends/rmk/devel-stable' into imx/imx6q
Diffstat (limited to 'arch/arm/mach-imx/mach-mx35_3ds.c')
| -rw-r--r-- | arch/arm/mach-imx/mach-mx35_3ds.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mach-mx35_3ds.c b/arch/arm/mach-imx/mach-mx35_3ds.c index b3b9bd8ac2a..f2a873dc08c 100644 --- a/arch/arm/mach-imx/mach-mx35_3ds.c +++ b/arch/arm/mach-imx/mach-mx35_3ds.c | |||
| @@ -217,7 +217,7 @@ struct sys_timer mx35pdk_timer = { | |||
| 217 | 217 | ||
| 218 | MACHINE_START(MX35_3DS, "Freescale MX35PDK") | 218 | MACHINE_START(MX35_3DS, "Freescale MX35PDK") |
| 219 | /* Maintainer: Freescale Semiconductor, Inc */ | 219 | /* Maintainer: Freescale Semiconductor, Inc */ |
| 220 | .boot_params = MX3x_PHYS_OFFSET + 0x100, | 220 | .atag_offset = 0x100, |
| 221 | .map_io = mx35_map_io, | 221 | .map_io = mx35_map_io, |
| 222 | .init_early = imx35_init_early, | 222 | .init_early = imx35_init_early, |
| 223 | .init_irq = mx35_init_irq, | 223 | .init_irq = mx35_init_irq, |