drivers/net: delete ISA intel eexpress and eepro i825xx drivers

[firefly-linux-kernel-4.4.55.git] / drivers / net / Space.c

diff --git a/drivers/net/Space.c b/drivers/net/Space.c
index c6e51943caafece0871f107c82a2c3a7d6a4e698..726b17b79610b9e4ca6a73174e1aa7f6ee7c9b6a 100644 (file)
--- a/drivers/net/Space.c
+++ b/drivers/net/Space.c
@@ -44,16 +44,11 @@ extern struct net_device *el2_probe(int unit);
 extern struct net_device *ne_probe(int unit);
 extern struct net_device *hp_probe(int unit);
 extern struct net_device *hp_plus_probe(int unit);
-extern struct net_device *express_probe(int unit);
-extern struct net_device *eepro_probe(int unit);
 extern struct net_device *at1700_probe(int unit);
 extern struct net_device *fmv18x_probe(int unit);
 extern struct net_device *eth16i_probe(int unit);
 extern struct net_device *i82596_probe(int unit);
 extern struct net_device *ewrk3_probe(int unit);
-extern struct net_device *el1_probe(int unit);
-extern struct net_device *el16_probe(int unit);
-extern struct net_device *elplus_probe(int unit);
 extern struct net_device *e2100_probe(int unit);
 extern struct net_device *ni5010_probe(int unit);
 extern struct net_device *ni52_probe(int unit);
@@ -74,9 +69,6 @@ extern struct net_device *mac89x0_probe(int unit);
 extern struct net_device *cops_probe(int unit);
 extern struct net_device *ltpc_probe(void);
 
-/* Detachable devices ("pocket adaptors") */
-extern struct net_device *de620_probe(int unit);
-
 /* Fibre Channel adapters */
 extern int iph5526_probe(struct net_device *dev);
 
@@ -156,27 +148,12 @@ static struct devprobe2 isa_probes[] __initdata = {
 #ifdef CONFIG_ETH16I
        {eth16i_probe, 0},      /* ICL EtherTeam 16i/32 */
 #endif
-#ifdef CONFIG_EEXPRESS         /* Intel EtherExpress */
-       {express_probe, 0},
-#endif
-#ifdef CONFIG_EEXPRESS_PRO     /* Intel EtherExpress Pro/10 */
-       {eepro_probe, 0},
-#endif
 #ifdef CONFIG_EWRK3             /* DEC EtherWORKS 3 */
        {ewrk3_probe, 0},
 #endif
 #if defined(CONFIG_MVME16x_NET) || defined(CONFIG_BVME6000_NET)        /* Intel I82596 */
        {i82596_probe, 0},
 #endif
-#ifdef CONFIG_EL1              /* 3c501 */
-       {el1_probe, 0},
-#endif
-#ifdef CONFIG_EL16             /* 3c507 */
-       {el16_probe, 0},
-#endif
-#ifdef CONFIG_ELPLUS           /* 3c505 */
-       {elplus_probe, 0},
-#endif
 #ifdef CONFIG_NI5010
        {ni5010_probe, 0},
 #endif
@@ -189,13 +166,6 @@ static struct devprobe2 isa_probes[] __initdata = {
        {NULL, 0},
 };
 
-static struct devprobe2 parport_probes[] __initdata = {
-#ifdef CONFIG_DE620            /* D-Link DE-620 adapter */
-       {de620_probe, 0},
-#endif
-       {NULL, 0},
-};
-
 static struct devprobe2 m68k_probes[] __initdata = {
 #ifdef CONFIG_ATARILANCE       /* Lance-based Atari ethernet boards */
        {atarilance_probe, 0},
@@ -234,8 +204,7 @@ static void __init ethif_probe2(int unit)
                return;
 
        (void)( probe_list2(unit, m68k_probes, base_addr == 0) &&
-               probe_list2(unit, isa_probes, base_addr == 0) &&
-               probe_list2(unit, parport_probes, base_addr == 0));
+               probe_list2(unit, isa_probes, base_addr == 0));
 }
 
 /*  Statically configured drivers -- order matters here. */