vserver 1.9.5.x5

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

diff --git a/drivers/net/Space.c b/drivers/net/Space.c
index 7df6deb..dbc3ec7 100644 (file)
--- a/drivers/net/Space.c
+++ b/drivers/net/Space.c
@@ -191,8 +191,8 @@ static struct devprobe2 isa_probes[] __initdata = {
 #ifdef CONFIG_E2100            /* Cabletron E21xx series. */
        {e2100_probe, 0},
 #endif
-#if defined(CONFIG_NE2000) || defined(CONFIG_NE2K_CBUS)        || \
-    defined(CONFIG_NE_H8300)  /* ISA & PC-9800 CBUS (use ne2k-pci for PCI cards) */
+#if defined(CONFIG_NE2000) || \
+    defined(CONFIG_NE_H8300)  /* ISA (use ne2k-pci for PCI cards) */
        {ne_probe, 0},
 #endif
 #ifdef CONFIG_LANCE            /* ISA/VLB (use pcnet32 for PCI cards) */
@@ -284,9 +284,6 @@ static struct devprobe2 m68k_probes[] __initdata = {
 #ifdef CONFIG_ATARI_PAMSNET    /* Atari PAMsNet Ethernet board */
        {pamsnet_probe, 0},
 #endif
-#ifdef CONFIG_HPLANCE          /* HP300 internal Ethernet */
-       {hplance_probe, 0},
-#endif
 #ifdef CONFIG_MVME147_NET      /* MVME147 internal Ethernet */
        {mvme147lance_probe, 0},
 #endif