x86: rename the i8259_32/64.c leftovers to irqinit_32/64.c

[linux-2.6] / drivers / parisc / dino.c

diff --git a/drivers/parisc/dino.c b/drivers/parisc/dino.c
index 0d96c50ffe9cdb26d4f353d321247c7b166fb4d9..d9c6322a721b8390879f4f71a017756691ddfd5a 100644 (file)
--- a/drivers/parisc/dino.c
+++ b/drivers/parisc/dino.c
@@ -368,8 +368,7 @@ static struct hw_interrupt_type dino_interrupt_type = {
  * ilr_loop counter is a kluge to prevent a "stuck" IRQ line from
  * wedging the CPU. Could be removed or made optional at some point.
  */
-static irqreturn_t
-dino_isr(int irq, void *intr_dev, struct pt_regs *regs)
+static irqreturn_t dino_isr(int irq, void *intr_dev)
 {
        struct dino_device *dino_dev = intr_dev;
        u32 mask;
@@ -390,7 +389,7 @@ ilr_again:
                int irq = dino_dev->global_irq[local_irq];
                DBG(KERN_DEBUG "%s(%d, %p) mask 0x%x\n",
                        __FUNCTION__, irq, intr_dev, mask);
-               __do_IRQ(irq, regs);
+               __do_IRQ(irq);
                mask &= ~(1 << local_irq);
        } while (mask);
 
@@ -497,7 +496,6 @@ dino_card_setup(struct pci_bus *bus, void __iomem *base_addr)
                list_for_each_safe(ln, tmp_ln, &bus->devices) {
                        struct pci_dev *dev = pci_dev_b(ln);
 
-                       list_del(&dev->global_list);
                        list_del(&dev->bus_list);
                }