Linux-Kernel v2.2.11

David Weinehall (tao@acc.umu.se)
Mon, 2 Aug 1999 14:10:35 +0200 (MET_DST)


Here are two patches that adds a missed out export for an mca-specific
symbol, and a fix of the sk_mca-driver, that suffered from this...

/David Weinehall
_ _
// David Weinehall <tao@acc.umu.se> /> Northern lights wander \\
// Project MCA Linux hacker // Dance across the winter sky //
\> http://www.acc.umu.se/~tao/ </ Full colour fire </

--- linux/arch/i386/kernel/i386_ksyms.c.old Tue Jun 8 09:54:44 1999
+++ linux/arch/i386/kernel/i386_ksyms.c Tue Jun 8 09:55:09 1999
@@ -110,6 +110,7 @@
EXPORT_SYMBOL(mca_mark_as_used);
EXPORT_SYMBOL(mca_mark_as_unused);
EXPORT_SYMBOL(mca_find_unused_adapter);
+EXPORT_SYMBOL(mca_is_adapter_used);
#endif

#ifdef CONFIG_VT

--- linux/drivers/net/sk_mca.c Mon Jun 7 23:34:54 1999
+++ linux-2.2.11pre4/drivers/net/sk_mca.c Mon Aug 2 13:52:08 1999
@@ -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 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 ? */

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/