Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6

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

diff --git a/drivers/net/Space.c b/drivers/net/Space.c
index 9305eb9b1b98fde55e17e580f7997b2ea77129b6..dd8ed456c8b225c28e7bd843119d7813f017b3d0 100644 (file)
--- a/drivers/net/Space.c
+++ b/drivers/net/Space.c
@@ -59,7 +59,6 @@ extern struct net_device *wavelan_probe(int unit);
 extern struct net_device *arlan_probe(int unit);
 extern struct net_device *el16_probe(int unit);
 extern struct net_device *elmc_probe(int unit);
-extern struct net_device *skmca_probe(int unit);
 extern struct net_device *elplus_probe(int unit);
 extern struct net_device *ac3200_probe(int unit);
 extern struct net_device *es_probe(int unit);
@@ -152,9 +151,6 @@ static struct devprobe2 mca_probes[] __initdata = {
 #endif
 #ifdef CONFIG_ELMC_II          /* 3c527 */
        {mc32_probe, 0},
-#endif
-#ifdef CONFIG_SKMC              /* SKnet Microchannel */
-        {skmca_probe, 0},
 #endif
        {NULL, 0},
 };