PCI: remove duplicate device id from ipr

[linux-2.6-omap-h63xx.git] / drivers / fc4 / soc.c

diff --git a/drivers/fc4/soc.c b/drivers/fc4/soc.c
index cf8768b8d1f126f5c488057dd348a1d6082bafcc..b09dfc78e5a2b10d34965ede7329ed7a8a311652 100644 (file)
--- a/drivers/fc4/soc.c
+++ b/drivers/fc4/soc.c
@@ -334,7 +334,7 @@ update_out:
        }
 }
 
-static irqreturn_t soc_intr(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t soc_intr(int irq, void *dev_id)
 {
        u32 cmd;
        unsigned long flags;
@@ -637,7 +637,7 @@ static inline void soc_init(struct sbus_dev *sdev, int no)
        
        irq = sdev->irqs[0];
 
-       if (request_irq (irq, soc_intr, SA_SHIRQ, "SOC", (void *)s)) {
+       if (request_irq (irq, soc_intr, IRQF_SHARED, "SOC", (void *)s)) {
                soc_printk ("Cannot order irq %d to go\n", irq);
                socs = s->next;
                return;