git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'sh/serial-rework' and 'sh/oprofile'
[pandora-kernel.git]
/
arch
/
arm
/
mach-ns9xxx
/
irq.c
diff --git
a/arch/arm/mach-ns9xxx/irq.c
b/arch/arm/mach-ns9xxx/irq.c
index
38260d5
..
22e0eb6
100644
(file)
--- a/
arch/arm/mach-ns9xxx/irq.c
+++ b/
arch/arm/mach-ns9xxx/irq.c
@@
-10,7
+10,7
@@
*/
#include <linux/interrupt.h>
#include <linux/kernel_stat.h>
-#include <
asm
/io.h>
+#include <
linux
/io.h>
#include <asm/mach/irq.h>
#include <mach/regs-sys-common.h>
#include <mach/irqs.h>