diff options
author | Olof Johansson <olof@lixom.net> | 2013-04-02 10:59:15 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-04-02 10:59:28 -0700 |
commit | c2573077dfacebdf58f69c666e8f15e9528e5a12 (patch) | |
tree | e2a6b24366a6b8d75e5b885d82ed25a11da35317 /arch/arm/mach-s3c24xx | |
parent | 46f101df788b38fafa08e85dcbf85d3bff6c1ea3 (diff) | |
parent | c0114709ed85a5693eb74acdfa03d94f7f12e5b8 (diff) |
Merge branch 'gic' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64 into next/cleanup
* 'gic' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64:
irqchip: gic: Perform the gic_secondary_init() call via CPU notifier
irqchip: gic: Call handle_bad_irq() directly
arm: Move chained_irq_(enter|exit) to a generic file
arm: Move the set_handle_irq and handle_arch_irq declarations to asm/irq.h
+ Linux 3.9-rc3
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-s3c24xx')
-rw-r--r-- | arch/arm/mach-s3c24xx/irq.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c24xx/irq.c b/arch/arm/mach-s3c24xx/irq.c index c1b96f7cc58..05be3e2487a 100644 --- a/arch/arm/mach-s3c24xx/irq.c +++ b/arch/arm/mach-s3c24xx/irq.c @@ -25,6 +25,7 @@ #include <linux/ioport.h> #include <linux/device.h> #include <linux/irqdomain.h> +#include <linux/irqchip/chained_irq.h> #include <asm/mach/irq.h> |