The following removes the pci device module alias if both skge and sk98lin
are compiled as modules. This means the clueless user who builds both modules
will get the skge driver loaded. If they really want to run sk98lin, they
can always modprobe it explicitly.
Signed-off-by: Stephen Hemminger <[EMAIL PROTECTED]>
--- git-2.6.orig/drivers/net/sk98lin/skge.c
+++ git-2.6/drivers/net/sk98lin/skge.c
@@ -5120,7 +5120,10 @@ static struct pci_device_id skge_pci_tbl
{ 0 }
};
+/* If new skge driver is available, then prefer that one. */
+#ifndef CONFIG_SKGE_MODULE
MODULE_DEVICE_TABLE(pci, skge_pci_tbl);
+#endif
static struct pci_driver skge_driver = {
.name = "sk98lin",
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
