diff options
| author | Olof Johansson <olof@lixom.net> | 2013-04-02 13:59:15 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-04-02 13:59:28 -0400 |
| commit | c2573077dfacebdf58f69c666e8f15e9528e5a12 (patch) | |
| tree | e2a6b24366a6b8d75e5b885d82ed25a11da35317 /drivers/irqchip/irq-vic.c | |
| 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 'drivers/irqchip/irq-vic.c')
| -rw-r--r-- | drivers/irqchip/irq-vic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/irqchip/irq-vic.c b/drivers/irqchip/irq-vic.c index 3cf97aaebe40..e38cb00ee784 100644 --- a/drivers/irqchip/irq-vic.c +++ b/drivers/irqchip/irq-vic.c | |||
| @@ -33,7 +33,7 @@ | |||
| 33 | #include <linux/irqchip/arm-vic.h> | 33 | #include <linux/irqchip/arm-vic.h> |
| 34 | 34 | ||
| 35 | #include <asm/exception.h> | 35 | #include <asm/exception.h> |
| 36 | #include <asm/mach/irq.h> | 36 | #include <asm/irq.h> |
| 37 | 37 | ||
| 38 | #include "irqchip.h" | 38 | #include "irqchip.h" |
| 39 | 39 | ||