tunnels: fix netns vs proto registration ordering

[safe/jmp/linux-2.6] / drivers / net / Space.c

diff --git a/drivers/net/Space.c b/drivers/net/Space.c
index 9953201..3b79c6c 100644 (file)
--- a/drivers/net/Space.c
+++ b/drivers/net/Space.c
@@ -33,7 +33,6 @@
 #include <linux/errno.h>
 #include <linux/init.h>
 #include <linux/netlink.h>
-#include <linux/divert.h>
 
 /* A unified ethernet device probe.  This is the easiest way to have every
    ethernet adaptor have the name "eth[0123...]".
@@ -60,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);
@@ -77,15 +75,12 @@ extern struct net_device *atarilance_probe(int unit);
 extern struct net_device *sun3lance_probe(int unit);
 extern struct net_device *sun3_82586_probe(int unit);
 extern struct net_device *apne_probe(int unit);
-extern struct net_device *bionet_probe(int unit);
-extern struct net_device *pamsnet_probe(int unit);
 extern struct net_device *cs89x0_probe(int unit);
 extern struct net_device *hplance_probe(int unit);
 extern struct net_device *bagetlance_probe(int unit);
 extern struct net_device *mvme147lance_probe(int unit);
 extern struct net_device *tc515_probe(int unit);
 extern struct net_device *lance_probe(int unit);
-extern struct net_device *mace_probe(int unit);
 extern struct net_device *mac8390_probe(int unit);
 extern struct net_device *mac89x0_probe(int unit);
 extern struct net_device *mc32_probe(int unit);
@@ -154,9 +149,6 @@ static struct devprobe2 mca_probes[] __initdata = {
 #ifdef CONFIG_ELMC_II          /* 3c527 */
        {mc32_probe, 0},
 #endif
-#ifdef CONFIG_SKMC              /* SKnet Microchannel */
-        {skmca_probe, 0},
-#endif
        {NULL, 0},
 };
 
@@ -165,7 +157,7 @@ static struct devprobe2 mca_probes[] __initdata = {
  * look for EISA/PCI/MCA cards in addition to ISA cards).
  */
 static struct devprobe2 isa_probes[] __initdata = {
-#ifdef CONFIG_HP100            /* ISA, EISA & PCI */
+#if defined(CONFIG_HP100) && defined(CONFIG_ISA)       /* ISA, EISA */
        {hp100_probe, 0},
 #endif
 #ifdef CONFIG_3C515
@@ -270,18 +262,9 @@ static struct devprobe2 m68k_probes[] __initdata = {
 #ifdef CONFIG_APNE             /* A1200 PCMCIA NE2000 */
        {apne_probe, 0},
 #endif
-#ifdef CONFIG_ATARI_BIONET     /* Atari Bionet Ethernet board */
-       {bionet_probe, 0},
-#endif
-#ifdef CONFIG_ATARI_PAMSNET    /* Atari PAMsNet Ethernet board */
-       {pamsnet_probe, 0},
-#endif
 #ifdef CONFIG_MVME147_NET      /* MVME147 internal Ethernet */
        {mvme147lance_probe, 0},
 #endif
-#ifdef CONFIG_MACMACE          /* Mac 68k Quadra AV builtin Ethernet */
-       {mace_probe, 0},
-#endif
 #ifdef CONFIG_MAC8390           /* NuBus NS8390-based cards */
        {mac8390_probe, 0},
 #endif
@@ -350,22 +333,11 @@ static void __init trif_probe2(int unit)
 #endif
 
 
-/*
- *     The loopback device is global so it can be directly referenced
- *     by the network code. Also, it must be first on device list.
- */
-extern int loopback_init(void);
-
 /*  Statically configured drivers -- order matters here. */
 static int __init net_olddevs_init(void)
 {
        int num;
 
-       if (loopback_init()) {
-               printk(KERN_ERR "Network loopback device setup failed\n");
-       }
-
-
 #ifdef CONFIG_SBNI
        for (num = 0; num < 8; ++num)
                sbni_probe(num);