diff options
| author | Olaf Hering <olaf@aepfle.de> | 2006-10-07 22:08:26 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-10-07 22:08:26 +1000 |
| commit | 35a84c2f56e0f77ea2c5a4327b17104705f4c8c7 (patch) | |
| tree | 856df3bb21b1a9c7910d956b4ee59be2041b7525 /arch/powerpc/platforms/85xx/mpc85xx_cds.c | |
| parent | 1224f373c974eacc46fe5e1073422c794d0b0d34 (diff) | |
[POWERPC] Fix up after irq changes
Remove struct pt_regs * from all handlers.
Also remove the regs argument from get_irq() functions.
Compile tested with arch/powerpc/config/* and
arch/ppc/configs/prep_defconfig
Signed-off-by: Olaf Hering <olaf@aepfle.de>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/platforms/85xx/mpc85xx_cds.c')
| -rw-r--r-- | arch/powerpc/platforms/85xx/mpc85xx_cds.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_cds.c b/arch/powerpc/platforms/85xx/mpc85xx_cds.c index b92fc6976a4..953cd5dd3f5 100644 --- a/arch/powerpc/platforms/85xx/mpc85xx_cds.c +++ b/arch/powerpc/platforms/85xx/mpc85xx_cds.c @@ -132,10 +132,9 @@ mpc85xx_cds_pcibios_fixup(void) #ifdef CONFIG_PPC_I8259 #warning The i8259 PIC support is currently broken -static void mpc85xx_8259_cascade(unsigned int irq, struct - irq_desc *desc, struct pt_regs *regs) +static void mpc85xx_8259_cascade(unsigned int irq, struct irq_desc *desc) { - unsigned int cascade_irq = i8259_irq(regs); + unsigned int cascade_irq = i8259_irq(); if (cascade_irq != NO_IRQ) generic_handle_irq(cascade_irq); @@ -150,8 +149,10 @@ void __init mpc85xx_cds_pic_init(void) struct mpic *mpic; struct resource r; struct device_node *np = NULL; +#ifdef CONFIG_PPC_I8259 struct device_node *cascade_node = NULL; int cascade_irq; +#endif np = of_find_node_by_type(np, "open-pic"); |