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
Pull novell-bugzilla-156426 into release branch
[pandora-kernel.git]
/
arch
/
mips
/
cobalt
/
irq.c
diff --git
a/arch/mips/cobalt/irq.c
b/arch/mips/cobalt/irq.c
index
0d90851
..
0b75f4f
100644
(file)
--- a/
arch/mips/cobalt/irq.c
+++ b/
arch/mips/cobalt/irq.c
@@
-18,9
+18,7
@@
#include <asm/gt64120.h>
#include <asm/ptrace.h>
#include <asm/gt64120.h>
#include <asm/ptrace.h>
-#include <asm/cobalt/cobalt.h>
-
-extern void cobalt_handle_int(void);
+#include <asm/mach-cobalt/cobalt.h>
/*
* We have two types of interrupts that we handle, ones that come in through
/*
* We have two types of interrupts that we handle, ones that come in through
@@
-79,7
+77,7
@@
static inline void via_pic_irq(struct pt_regs *regs)
do_IRQ(irq, regs);
}
do_IRQ(irq, regs);
}
-asmlinkage void
cobalt_irq
(struct pt_regs *regs)
+asmlinkage void
plat_irq_dispatch
(struct pt_regs *regs)
{
unsigned pending;
{
unsigned pending;
@@
-122,8
+120,6
@@
void __init arch_init_irq(void)
*/
GALILEO_OUTL(0, GT_INTRMASK_OFS);
*/
GALILEO_OUTL(0, GT_INTRMASK_OFS);
- set_except_vector(0, cobalt_handle_int);
-
init_i8259_irqs(); /* 0 ... 15 */
mips_cpu_irq_init(COBALT_CPU_IRQ); /* 16 ... 23 */
init_i8259_irqs(); /* 0 ... 15 */
mips_cpu_irq_init(COBALT_CPU_IRQ); /* 16 ... 23 */