fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / arch / ppc / platforms / radstone_ppc7d.c

diff --git a/arch/ppc/platforms/radstone_ppc7d.c b/arch/ppc/platforms/radstone_ppc7d.c
index 3bb530a..13d70ab 100644 (file)
--- a/arch/ppc/platforms/radstone_ppc7d.c
+++ b/arch/ppc/platforms/radstone_ppc7d.c
@@ -451,11 +451,11 @@ static void __init ppc7d_calibrate_decr(void)
  * Interrupt stuff
  *****************************************************************************/
 
-static irqreturn_t ppc7d_i8259_intr(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t ppc7d_i8259_intr(int irq, void *dev_id)
 {
        u32 temp = mv64x60_read(&bh, MV64x60_GPP_INTR_CAUSE);
        if (temp & (1 << 28)) {
-               i8259_irq(regs);
+               i8259_irq();
                mv64x60_write(&bh, MV64x60_GPP_INTR_CAUSE, temp & (~(1 << 28)));
                return IRQ_HANDLED;
        }
@@ -536,13 +536,13 @@ static u32 ppc7d_irq_canonicalize(u32 irq)
        return irq;
 }
 
-static int ppc7d_get_irq(struct pt_regs *regs)
+static int ppc7d_get_irq(void)
 {
        int irq;
 
-       irq = mv64360_get_irq(regs);
+       irq = mv64360_get_irq();
        if (irq == (mv64360_irq_base + MV64x60_IRQ_GPP28))
-               irq = i8259_irq(regs);
+               irq = i8259_irq();
        return irq;
 }