git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
mips
/
au1000
/
pb1200
/
irqmap.c
diff --git
a/arch/mips/au1000/pb1200/irqmap.c
b/arch/mips/au1000/pb1200/irqmap.c
index
f66779f
..
91983ba
100644
(file)
--- a/
arch/mips/au1000/pb1200/irqmap.c
+++ b/
arch/mips/au1000/pb1200/irqmap.c
@@
-65,7
+65,7
@@
int __initdata au1xxx_nr_irqs = ARRAY_SIZE(au1xxx_irq_map);
*/
static volatile int pb1200_cascade_en=0;
*/
static volatile int pb1200_cascade_en=0;
-irqreturn_t pb1200_cascade_handler( int irq, void *dev_id
, struct pt_regs *regs
)
+irqreturn_t pb1200_cascade_handler( int irq, void *dev_id)
{
unsigned short bisr = bcsr->int_status;
int extirq_nr = 0;
{
unsigned short bisr = bcsr->int_status;
int extirq_nr = 0;
@@
-76,8
+76,9
@@
irqreturn_t pb1200_cascade_handler( int irq, void *dev_id, struct pt_regs *regs)
{
extirq_nr = (PB1200_INT_BEGIN-1) + au_ffs(bisr);
/* Ack and dispatch IRQ */
{
extirq_nr = (PB1200_INT_BEGIN-1) + au_ffs(bisr);
/* Ack and dispatch IRQ */
- do_IRQ(extirq_nr
,regs
);
+ do_IRQ(extirq_nr);
}
}
+
return IRQ_RETVAL(1);
}
return IRQ_RETVAL(1);
}