diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2014-07-19 10:14:55 +0200 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2014-07-19 10:14:55 +0200 |
commit | 1b0733837a9b2b8e006c787c628d0085073a5c36 (patch) | |
tree | 3da13a254cd180bb17064be2befd916f3ba5f26a /arch/arm64/kernel/hyp-stub.S | |
parent | d709f7bcbb3ab01704fa7b37a2e4b981cf3783c1 (diff) | |
parent | f0cf9d2facbe3aa93b302058c013729cbc1bca22 (diff) | |
download | linux-1b0733837a9b2b8e006c787c628d0085073a5c36.tar.gz linux-1b0733837a9b2b8e006c787c628d0085073a5c36.tar.bz2 linux-1b0733837a9b2b8e006c787c628d0085073a5c36.zip |
Merge tag 'irqchip-core-3.17-3' of git://git.infradead.org/users/jcooper/linux into irq/core
irqchip core changes for v3.17 (round #3) from Jason Cooper
* gic: Add GICv3 driver
* atmel: Move atmel aic driver from arch code to irqchip/
Diffstat (limited to 'arch/arm64/kernel/hyp-stub.S')
-rw-r--r-- | arch/arm64/kernel/hyp-stub.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/kernel/hyp-stub.S b/arch/arm64/kernel/hyp-stub.S index 0959611d9ff1..a272f335c289 100644 --- a/arch/arm64/kernel/hyp-stub.S +++ b/arch/arm64/kernel/hyp-stub.S @@ -19,6 +19,7 @@ #include <linux/init.h> #include <linux/linkage.h> +#include <linux/irqchip/arm-gic-v3.h> #include <asm/assembler.h> #include <asm/ptrace.h> |