Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...

[linux-2.6-omap-h63xx.git] / drivers / net / arcnet / com20020.c

diff --git a/drivers/net/arcnet/com20020.c b/drivers/net/arcnet/com20020.c
index 4218075c8aa38e47b878386c9627169659cbbb54..8b51313b1300b9f5b4c30c2eb9ff3383c2cb759f 100644 (file)
--- a/drivers/net/arcnet/com20020.c
+++ b/drivers/net/arcnet/com20020.c
@@ -104,7 +104,7 @@ int com20020_check(struct net_device *dev)
        SET_SUBADR(SUB_SETUP1);
        outb(lp->setup, _XREG);
 
-       if (lp->card_flags & ARC_CAN_10MBIT)
+       if (lp->clockm != 0)
        {
                SET_SUBADR(SUB_SETUP2);
                outb(lp->setup2, _XREG);
@@ -348,14 +348,15 @@ MODULE_LICENSE("GPL");
 
 #ifdef MODULE
 
-int init_module(void)
+static int __init com20020_module_init(void)
 {
        BUGLVL(D_NORMAL) printk(VERSION);
        return 0;
 }
 
-void cleanup_module(void)
+static void __exit com20020_module_exit(void)
 {
 }
-
+module_init(com20020_module_init);
+module_exit(com20020_module_exit);
 #endif                         /* MODULE */