patch-2.3.15 linux/drivers/net/sk_mca.c

• Lines: 54
• Date: Mon Aug 23 13:44:03 1999
• Orig file: v2.3.14/linux/drivers/net/sk_mca.c
• Orig date: Wed Aug 18 11:36:42 1999

diff -u --recursive --new-file v2.3.14/linux/drivers/net/sk_mca.c linux/drivers/net/sk_mca.c
@@ -62,9 +62,14 @@
 	implemented LANCE multicast filter
   Jun 6th, 1999
 	additions for Linux 2.2
+  Aug 2nd, 1999
+	small fixes (David Weinehall)
 
  *************************************************************************/
 
+#include <linux/module.h>
+#include <linux/version.h>
+
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/string.h>
@@ -79,11 +84,6 @@
 #include <asm/bitops.h>
 #include <asm/io.h>
 
-#ifdef MODULE
-#include <linux/module.h>
-#include <linux/version.h>
-#endif
-
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
@@ -871,7 +871,7 @@
   return &(priv->stat);
 }
 
-/* we don't support runtime reconfiguration, since am MCA card can
+/* we don't support runtime reconfiguration, since an MCA card can
    be unambigously identified by its POS registers. */
 
 static int skmca_config(struct net_device *dev, struct ifmap *map)
@@ -962,9 +962,6 @@
 
     getaddrs(slot, junior, &base, &irq, &medium);
 
-#if 0
-    /* this should work, but it doesn't with 2.2.9 :-( 
-       somehow 'mca_is_adapter_used()' is missing in kernel syms... */
 #if LINUX_VERSION_CODE >= 0x020200
     /* slot already in use ? */
 
@@ -973,7 +970,6 @@
       slot = dofind(&junior, slot + 1);
       continue;
     }
-#endif
 #endif
 
     /* were we looking for something different ? */