diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-08-09 13:03:13 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-08-09 13:03:13 -0400 |
| commit | 492c71dd545a54dc62df8780bd8d233d771748df (patch) | |
| tree | 73960c90dd47938000478b9b3b1228a8c860e65b /arch/arm/mach-loki/irq.c | |
| parent | f0af7245f1725fdc39b32b59c20500448437ddbe (diff) | |
| parent | 18365d181fe7fee8b52cd12482200d3a4c48d05e (diff) | |
Merge branch 'for-rmk' of git://git.marvell.com/orion
Diffstat (limited to 'arch/arm/mach-loki/irq.c')
| -rw-r--r-- | arch/arm/mach-loki/irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-loki/irq.c b/arch/arm/mach-loki/irq.c index d839af91fe03..5a487930cb2f 100644 --- a/arch/arm/mach-loki/irq.c +++ b/arch/arm/mach-loki/irq.c | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 13 | #include <linux/irq.h> | 13 | #include <linux/irq.h> |
| 14 | #include <asm/io.h> | 14 | #include <asm/io.h> |
| 15 | #include <asm/plat-orion/irq.h> | 15 | #include <plat/irq.h> |
| 16 | #include "common.h" | 16 | #include "common.h" |
| 17 | 17 | ||
| 18 | void __init loki_init_irq(void) | 18 | void __init loki_init_irq(void) |