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
/
ppc
/
platforms
/
sbc82xx.c
diff --git
a/arch/ppc/platforms/sbc82xx.c
b/arch/ppc/platforms/sbc82xx.c
index
74c9ff7
..
cc0935c
100644
(file)
--- a/
arch/ppc/platforms/sbc82xx.c
+++ b/
arch/ppc/platforms/sbc82xx.c
@@
-1,6
+1,4
@@
/*
/*
- * arch/ppc/platforms/sbc82xx.c
- *
* SBC82XX platform support
*
* Author: Guy Streeter <streeter@redhat.com>
* SBC82XX platform support
*
* Author: Guy Streeter <streeter@redhat.com>
@@
-15,7
+13,6
@@
* option) any later version.
*/
* option) any later version.
*/
-#include <linux/config.h>
#include <linux/stddef.h>
#include <linux/interrupt.h>
#include <linux/irq.h>
#include <linux/stddef.h>
#include <linux/interrupt.h>
#include <linux/irq.h>
@@
-124,7
+121,7
@@
struct hw_interrupt_type sbc82xx_i8259_ic = {
.end = sbc82xx_i8259_end_irq,
};
.end = sbc82xx_i8259_end_irq,
};
-static irqreturn_t sbc82xx_i8259_demux(int irq, void *dev_id
, struct pt_regs *regs
)
+static irqreturn_t sbc82xx_i8259_demux(int irq, void *dev_id)
{
spin_lock(&sbc82xx_i8259_lock);
{
spin_lock(&sbc82xx_i8259_lock);
@@
-142,13
+139,13
@@
static irqreturn_t sbc82xx_i8259_demux(int irq, void *dev_id, struct pt_regs *re
return IRQ_HANDLED;
}
}
return IRQ_HANDLED;
}
}
- __do_IRQ(NR_SIU_INTS + irq
, regs
);
+ __do_IRQ(NR_SIU_INTS + irq);
return IRQ_HANDLED;
}
static struct irqaction sbc82xx_i8259_irqaction = {
.handler = sbc82xx_i8259_demux,
return IRQ_HANDLED;
}
static struct irqaction sbc82xx_i8259_irqaction = {
.handler = sbc82xx_i8259_demux,
- .flags =
SA_INTERRUPT
,
+ .flags =
IRQF_DISABLED
,
.mask = CPU_MASK_NONE,
.name = "i8259 demux",
};
.mask = CPU_MASK_NONE,
.name = "i8259 demux",
};
@@
-174,7
+171,7
@@
void __init sbc82xx_init_IRQ(void)
/* Set up the interrupt handlers for the i8259 IRQs */
for (i = NR_SIU_INTS; i < NR_SIU_INTS + 8; i++) {
/* Set up the interrupt handlers for the i8259 IRQs */
for (i = NR_SIU_INTS; i < NR_SIU_INTS + 8; i++) {
- irq_desc[i].
handler
= &sbc82xx_i8259_ic;
+ irq_desc[i].
chip
= &sbc82xx_i8259_ic;
irq_desc[i].status |= IRQ_LEVEL;
}
irq_desc[i].status |= IRQ_LEVEL;
}