vserver 1.9.5.x5

[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 20b6a29..7b48064 100644 (file)
--- a/drivers/net/wan/cycx_main.c
+++ b/drivers/net/wan/cycx_main.c
@@ -57,7 +57,7 @@ unsigned int cycx_debug;
 MODULE_AUTHOR("Arnaldo Carvalho de Melo");
 MODULE_DESCRIPTION("Cyclom 2X Sync Card Driver.");
 MODULE_LICENSE("GPL");
-MODULE_PARM(cycx_debug, "i");
+module_param(cycx_debug, int, 0);
 MODULE_PARM_DESC(cycx_debug, "cyclomx debug level");
 
 /* Defines & Macros */
@@ -223,13 +223,12 @@ static int cycx_wan_setup(struct wan_device *wandev, wandev_conf_t *conf)
        /* Configure hardware, load firmware, etc. */
        memset(&card->hw, 0, sizeof(card->hw));
        card->hw.irq     = irq;
-       card->hw.dpmbase = (void *)conf->maddr;
        card->hw.dpmsize = CYCX_WINDOWSIZE;
        card->hw.fwid    = CFID_X25_2X;
-       card->lock       = SPIN_LOCK_UNLOCKED;
+       spin_lock_init(&card->lock);
        init_waitqueue_head(&card->wait_stats);
 
-       rc = cycx_setup(&card->hw, conf->data, conf->data_size);
+       rc = cycx_setup(&card->hw, conf->data, conf->data_size, conf->maddr);
        if (rc)
                goto out_irq;