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 'e1000-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[pandora-kernel.git]
/
arch
/
mips
/
cobalt
/
irq.c
diff --git
a/arch/mips/cobalt/irq.c
b/arch/mips/cobalt/irq.c
index
fe93b84
..
950ad1e
100644
(file)
--- a/
arch/mips/cobalt/irq.c
+++ b/
arch/mips/cobalt/irq.c
@@
-17,7
+17,7
@@
#include <asm/irq_cpu.h>
#include <asm/gt64120.h>
-#include <
asm/mach-cobalt/
cobalt.h>
+#include <cobalt.h>
/*
* We have two types of interrupts that we handle, ones that come in through