summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/irq.c
diff options
context:
space:
mode:
authorWill Deacon <will.deacon@arm.com>2013-02-02 19:03:10 +0400
committerWill Deacon <will.deacon@arm.com>2013-02-02 19:03:10 +0400
commit6c046e405564608dd0889e0938656781550fd70c (patch)
tree5a5bb29cec194493d30d40de8e1d21dd3fa106da /arch/arm/mach-tegra/irq.c
parent0d0ffa94e0ea0aab3dcb75366806d064f05fdc45 (diff)
parent9e47b8bf9815523a5816f2f83e73b13812d74014 (diff)
downloadlinux-6c046e405564608dd0889e0938656781550fd70c.tar.xz
Merge branch 'irqchip/gic-vic-move' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into for-arm-soc/virt/mach
Diffstat (limited to 'arch/arm/mach-tegra/irq.c')
-rw-r--r--arch/arm/mach-tegra/irq.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/irq.c b/arch/arm/mach-tegra/irq.c
index b7886f183511..2ff2128cb9d8 100644
--- a/arch/arm/mach-tegra/irq.c
+++ b/arch/arm/mach-tegra/irq.c
@@ -22,8 +22,7 @@
#include <linux/irq.h>
#include <linux/io.h>
#include <linux/of.h>
-
-#include <asm/hardware/gic.h>
+#include <linux/irqchip/arm-gic.h>
#include "board.h"
#include "iomap.h"