fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / drivers / net / wan / farsync.c

diff --git a/drivers/net/wan/farsync.c b/drivers/net/wan/farsync.c
index 3705db0..c45d6a8 100644 (file)
--- a/drivers/net/wan/farsync.c
+++ b/drivers/net/wan/farsync.c
@@ -1498,7 +1498,7 @@ do_bottom_half_rx(struct fst_card_info *card)
  *      Dev_id is our fst_card_info pointer
  */
 static irqreturn_t
-fst_intr(int irq, void *dev_id, struct pt_regs *regs)
+fst_intr(int irq, void *dev_id)
 {
        struct fst_card_info *card;
        struct fst_port_info *port;
@@ -2697,7 +2697,7 @@ fst_init(void)
        for (i = 0; i < FST_MAX_CARDS; i++)
                fst_card_array[i] = NULL;
        spin_lock_init(&fst_work_q_lock);
-       return pci_module_init(&fst_driver);
+       return pci_register_driver(&fst_driver);
 }
 
 static void __exit