diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-11-01 12:12:22 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-11-01 12:12:22 -0400 |
| commit | c72dbae971400e466ad9ff16c920cd6d9d8c55a1 (patch) | |
| tree | 7a0ebba8b14d889a8b42edfa1272be222b908a82 /arch/arm/mach-imx/mach-mx31_3ds.c | |
| parent | 7e1efcf5d2039fb7a91e21df32f4175dbca4d61c (diff) | |
| parent | b4cbb8a4e602ea77b0525d06eff89c6a6070dab3 (diff) | |
Merge branch 'imx/devel' into next/dt
The board changes in the imx/devel branch conflict with other changes in
the device imx/dt branch.
Conflicts:
arch/arm/mach-mx5/board-mx53_loco.c
arch/arm/mach-mx5/board-mx53_smd.c
arch/arm/plat-mxc/include/mach/common.h
arch/arm/plat-mxc/include/mach/memory.h
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-imx/mach-mx31_3ds.c')
| -rw-r--r-- | arch/arm/mach-imx/mach-mx31_3ds.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/mach-mx31_3ds.c b/arch/arm/mach-imx/mach-mx31_3ds.c index 589066fb3316..eb3e3fe20287 100644 --- a/arch/arm/mach-imx/mach-mx31_3ds.c +++ b/arch/arm/mach-imx/mach-mx31_3ds.c | |||
| @@ -768,6 +768,7 @@ MACHINE_START(MX31_3DS, "Freescale MX31PDK (3DS)") | |||
| 768 | .map_io = mx31_map_io, | 768 | .map_io = mx31_map_io, |
| 769 | .init_early = imx31_init_early, | 769 | .init_early = imx31_init_early, |
| 770 | .init_irq = mx31_init_irq, | 770 | .init_irq = mx31_init_irq, |
| 771 | .handle_irq = imx31_handle_irq, | ||
| 771 | .timer = &mx31_3ds_timer, | 772 | .timer = &mx31_3ds_timer, |
| 772 | .init_machine = mx31_3ds_init, | 773 | .init_machine = mx31_3ds_init, |
| 773 | .reserve = mx31_3ds_reserve, | 774 | .reserve = mx31_3ds_reserve, |