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 branch 'hotfixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
[pandora-kernel.git]
/
arch
/
sh
/
kernel
/
cpu
/
irq
/
intc-sh5.c
diff --git
a/arch/sh/kernel/cpu/irq/intc-sh5.c
b/arch/sh/kernel/cpu/irq/intc-sh5.c
index
de45c6a
..
726f033
100644
(file)
--- a/
arch/sh/kernel/cpu/irq/intc-sh5.c
+++ b/
arch/sh/kernel/cpu/irq/intc-sh5.c
@@
-20,7
+20,7
@@
#include <linux/io.h>
#include <linux/kernel.h>
#include <linux/bitops.h>
-#include <
asm/
cpu/irq.h>
+#include <cpu/irq.h>
#include <asm/page.h>
/*
@@
-242,6
+242,7
@@
void __init plat_irq_setup(void)
reg += 8;
}
}
+ }
#endif
/*