fedora core 6 1.2949 + vserver 2.2.0

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

diff --git a/drivers/net/wan/cycx_main.c b/drivers/net/wan/cycx_main.c
index a5e7ce1..6e5f1c8 100644 (file)
--- a/drivers/net/wan/cycx_main.c
+++ b/drivers/net/wan/cycx_main.c
@@ -74,7 +74,7 @@ static int cycx_wan_setup(struct wan_device *wandev, wandev_conf_t *conf);
 static int cycx_wan_shutdown(struct wan_device *wandev);
 
 /* Miscellaneous functions */
-static irqreturn_t cycx_isr(int irq, void *dev_id, struct pt_regs *regs);
+static irqreturn_t cycx_isr(int irq, void *dev_id);
 
 /* Global Data
  * Note: All data must be explicitly initialized!!!
@@ -301,11 +301,11 @@ out:      return ret;
  * o acknowledge Cyclom 2X hardware interrupt.
  * o call protocol-specific interrupt service routine, if any.
  */
-static irqreturn_t cycx_isr(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t cycx_isr(int irq, void *dev_id)
 {
-       struct cycx_device *card = (struct cycx_device *)dev_id;
+       struct cycx_device *card = dev_id;
 
-       if (!card || card->wandev.state == WAN_UNCONFIGURED)
+       if (card->wandev.state == WAN_UNCONFIGURED)
                goto out;
 
        if (card->in_isr) {