diff options
| author |  Arnd Bergmann <arnd@arndb.de>
| 2011-11-01 17:12:22 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de>
| 2011-11-01 17:12:22 +0100 |
| commit | c72dbae971400e466ad9ff16c920cd6d9d8c55a1 (patch) | |
| tree | 7a0ebba8b14d889a8b42edfa1272be222b908a82 /arch/arm/mach-imx/mach-mx27ads.c | |
| parent | ARM: gic: use module.h instead of export.h (diff) | |
| parent | Merge branch 'imx-features-for-arnd' of git://git.pengutronix.de/git/imx/linu... (diff) | |
| download | linux-c72dbae971400e466ad9ff16c920cd6d9d8c55a1.tar.gz linux-c72dbae971400e466ad9ff16c920cd6d9d8c55a1.tar.bz2 linux-c72dbae971400e466ad9ff16c920cd6d9d8c55a1.zip | |
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-mx27ads.c')
| -rw-r--r-- | arch/arm/mach-imx/mach-mx27ads.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/mach-mx27ads.c b/arch/arm/mach-imx/mach-mx27ads.c index efe6109099fd..e75f39147845 100644 --- a/arch/arm/mach-imx/mach-mx27ads.c +++ b/arch/arm/mach-imx/mach-mx27ads.c @@ -349,6 +349,7 @@ MACHINE_START(MX27ADS, "Freescale i.MX27ADS") .map_io = mx27ads_map_io, .init_early = imx27_init_early, .init_irq = mx27_init_irq, + .handle_irq = imx27_handle_irq, .timer = &mx27ads_timer, .init_machine = mx27ads_board_init, MACHINE_END |