summaryrefslogtreecommitdiff
path: root/arch/arm/plat-orion/irq.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-09-14 20:24:00 +0400
committerIngo Molnar <mingo@elte.hu>2008-09-14 20:24:00 +0400
commit83bd6998b04fc1bb7280b14f16b2bdbdc07c914b (patch)
treeaf1bbe2bac5752b69b1ac58bf5d822c735da439b /arch/arm/plat-orion/irq.c
parente7250b8ae3870f37f660c2f65cafcaba85e3bfd3 (diff)
parentadee14b2e1557d0a8559f29681732d05a89dfc35 (diff)
downloadlinux-83bd6998b04fc1bb7280b14f16b2bdbdc07c914b.tar.xz
Merge commit 'v2.6.27-rc6' into timers/hpet
Diffstat (limited to 'arch/arm/plat-orion/irq.c')
-rw-r--r--arch/arm/plat-orion/irq.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-orion/irq.c b/arch/arm/plat-orion/irq.c
index fe66a1835169..3f9d34fc738c 100644
--- a/arch/arm/plat-orion/irq.c
+++ b/arch/arm/plat-orion/irq.c
@@ -12,7 +12,7 @@
#include <linux/init.h>
#include <linux/irq.h>
#include <linux/io.h>
-#include <asm/plat-orion/irq.h>
+#include <plat/irq.h>
static void orion_irq_mask(u32 irq)
{