Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

[sfrench/cifs-2.6.git] / drivers / net / arcnet / com20020.c

diff --git a/drivers/net/arcnet/com20020.c b/drivers/net/arcnet/com20020.c
index aa9dd8f11269aeb3fe9a692ba89bcc205a70a156..7cf0a2511697fbe0aedc6b619c243b6b8d2269ef 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);
@@ -338,7 +338,8 @@ static void com20020_set_mc_list(struct net_device *dev)
 }
 
 #if defined(CONFIG_ARCNET_COM20020_PCI_MODULE) || \
-    defined(CONFIG_ARCNET_COM20020_ISA_MODULE)
+    defined(CONFIG_ARCNET_COM20020_ISA_MODULE) || \
+    defined(CONFIG_ARCNET_COM20020_CS_MODULE)
 EXPORT_SYMBOL(com20020_check);
 EXPORT_SYMBOL(com20020_found);
 #endif