diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 14:24:28 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 14:24:28 +0100 |
| commit | 7e0cac630c7c90f12a78131df9913657fa30243b (patch) | |
| tree | c09aa76b07a9bcb0ab0dea4885909421f7a9f4a6 /arch/arm/mach-imx/mach-mx21ads.c | |
| parent | Merge branch 'dt/gic' into imx/imx6q (diff) | |
| parent | Merge branch 'imx-features-for-arnd' of git://git.pengutronix.de/git/imx/linu... (diff) | |
| download | linux-7e0cac630c7c90f12a78131df9913657fa30243b.tar.xz linux-7e0cac630c7c90f12a78131df9913657fa30243b.zip | |
Merge branch 'imx/devel' into imx/imx6q
Conflicts:
arch/arm/plat-mxc/include/mach/memory.h
Diffstat (limited to 'arch/arm/mach-imx/mach-mx21ads.c')
| -rw-r--r-- | arch/arm/mach-imx/mach-mx21ads.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/mach-mx21ads.c b/arch/arm/mach-imx/mach-mx21ads.c index e56828da26b2..25f84028d055 100644 --- a/arch/arm/mach-imx/mach-mx21ads.c +++ b/arch/arm/mach-imx/mach-mx21ads.c @@ -309,6 +309,7 @@ MACHINE_START(MX21ADS, "Freescale i.MX21ADS") .map_io = mx21ads_map_io, .init_early = imx21_init_early, .init_irq = mx21_init_irq, + .handle_irq = imx21_handle_irq, .timer = &mx21ads_timer, .init_machine = mx21ads_board_init, MACHINE_END |