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-imx27ipcam.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-imx27ipcam.c')
| -rw-r--r-- | arch/arm/mach-imx/mach-imx27ipcam.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/mach-imx27ipcam.c b/arch/arm/mach-imx/mach-imx27ipcam.c index 8da48b33fc53..7052155d0557 100644 --- a/arch/arm/mach-imx/mach-imx27ipcam.c +++ b/arch/arm/mach-imx/mach-imx27ipcam.c | |||
| @@ -75,6 +75,7 @@ MACHINE_START(IMX27IPCAM, "Freescale IMX27IPCAM") | |||
| 75 | .map_io = mx27_map_io, | 75 | .map_io = mx27_map_io, |
| 76 | .init_early = imx27_init_early, | 76 | .init_early = imx27_init_early, |
| 77 | .init_irq = mx27_init_irq, | 77 | .init_irq = mx27_init_irq, |
| 78 | .handle_irq = imx27_handle_irq, | ||
| 78 | .timer = &mx27ipcam_timer, | 79 | .timer = &mx27ipcam_timer, |
| 79 | .init_machine = mx27ipcam_init, | 80 | .init_machine = mx27ipcam_init, |
| 80 | MACHINE_END | 81 | MACHINE_END |