merge linus into release branch

[linux-2.6-omap-h63xx.git] / drivers / net / hamradio / dmascc.c

diff --git a/drivers/net/hamradio/dmascc.c b/drivers/net/hamradio/dmascc.c
index 3be3f916643a17fcb53574f83cf39d8c8ae5bb9e..c9a46b89942af382ec10ac71f7a3710343fd0944 100644 (file)
--- a/drivers/net/hamradio/dmascc.c
+++ b/drivers/net/hamradio/dmascc.c
@@ -280,7 +280,7 @@ static unsigned long rand;
 
 MODULE_AUTHOR("Klaus Kudielka");
 MODULE_DESCRIPTION("Driver for high-speed SCC boards");
-MODULE_PARM(io, "1-" __MODULE_STRING(MAX_NUM_DEVS) "i");
+module_param_array(io, int, NULL, 0);
 MODULE_LICENSE("GPL");
 
 static void __exit dmascc_exit(void)
@@ -311,16 +311,6 @@ static void __exit dmascc_exit(void)
        }
 }
 
-#ifndef MODULE
-void __init dmascc_setup(char *str, int *ints)
-{
-       int i;
-
-       for (i = 0; i < MAX_NUM_DEVS && i < ints[0]; i++)
-               io[i] = ints[i + 1];
-}
-#endif
-
 static int __init dmascc_init(void)
 {
        int h, i, j, n;
@@ -446,7 +436,7 @@ static int __init dmascc_init(void)
 module_init(dmascc_init);
 module_exit(dmascc_exit);
 
-static void dev_setup(struct net_device *dev)
+static void __init dev_setup(struct net_device *dev)
 {
        dev->type = ARPHRD_AX25;
        dev->hard_header_len = AX25_MAX_HEADER_LEN;
@@ -592,7 +582,6 @@ static int __init setup_adapter(int card_base, int type, int n)
                INIT_WORK(&priv->rx_work, rx_bh, priv);
                dev->priv = priv;
                sprintf(dev->name, "dmascc%i", 2 * n + i);
-               SET_MODULE_OWNER(dev);
                dev->base_addr = card_base;
                dev->irq = irq;
                dev->open = scc_open;