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 'for-linus' of git://oss.sgi.com/xfs/xfs
[pandora-kernel.git]
/
arch
/
mips
/
kernel
/
irq-rm7000.c
diff --git
a/arch/mips/kernel/irq-rm7000.c
b/arch/mips/kernel/irq-rm7000.c
index
2507328
..
9731e8b
100644
(file)
--- a/
arch/mips/kernel/irq-rm7000.c
+++ b/
arch/mips/kernel/irq-rm7000.c
@@
-11,6
+11,7
@@
*/
#include <linux/init.h>
#include <linux/interrupt.h>
*/
#include <linux/init.h>
#include <linux/interrupt.h>
+#include <linux/irq.h>
#include <linux/kernel.h>
#include <asm/irq_cpu.h>
#include <linux/kernel.h>
#include <asm/irq_cpu.h>
@@
-33,6
+34,7
@@
static struct irq_chip rm7k_irq_controller = {
.mask = mask_rm7k_irq,
.mask_ack = mask_rm7k_irq,
.unmask = unmask_rm7k_irq,
.mask = mask_rm7k_irq,
.mask_ack = mask_rm7k_irq,
.unmask = unmask_rm7k_irq,
+ .eoi = unmask_rm7k_irq
};
void __init rm7k_cpu_irq_init(void)
};
void __init rm7k_cpu_irq_init(void)
@@
-44,5
+46,5
@@
void __init rm7k_cpu_irq_init(void)
for (i = base; i < base + 4; i++)
set_irq_chip_and_handler(i, &rm7k_irq_controller,
for (i = base; i < base + 4; i++)
set_irq_chip_and_handler(i, &rm7k_irq_controller,
- handle_
level
_irq);
+ handle_
percpu
_irq);
}
}