diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-12-27 23:45:51 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-12-27 23:45:51 +0100 |
| commit | e5570bbc9c06634cfac94e06ac1432b53d8595e5 (patch) | |
| tree | bfaf6b5ddedaa03d31400b25b25cfaa3bd0c9107 /arch/arm/mach-s3c64xx/mach-smartq5.c | |
| parent | Linux 3.2-rc4 (diff) | |
| parent | arm/tegra: Compile tegra_dt_init_irq only when CONFIG_OF (diff) | |
| download | linux-e5570bbc9c06634cfac94e06ac1432b53d8595e5.tar.xz linux-e5570bbc9c06634cfac94e06ac1432b53d8595e5.zip | |
Merge branch 'for-3.3/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra into tegra/soc
Diffstat (limited to 'arch/arm/mach-s3c64xx/mach-smartq5.c')
| -rw-r--r-- | arch/arm/mach-s3c64xx/mach-smartq5.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c64xx/mach-smartq5.c b/arch/arm/mach-s3c64xx/mach-smartq5.c index 94c831d88365..053945282652 100644 --- a/arch/arm/mach-s3c64xx/mach-smartq5.c +++ b/arch/arm/mach-s3c64xx/mach-smartq5.c @@ -17,6 +17,7 @@ #include <linux/leds.h> #include <linux/platform_device.h> +#include <asm/hardware/vic.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> @@ -148,6 +149,7 @@ MACHINE_START(SMARTQ5, "SmartQ 5") /* Maintainer: Maurus Cuelenaere <mcuelenaere AT gmail DOT com> */ .atag_offset = 0x100, .init_irq = s3c6410_init_irq, + .handle_irq = vic_handle_irq, .map_io = smartq_map_io, .init_machine = smartq5_machine_init, .timer = &s3c24xx_timer, |