net/at91_ether: use ethtool and mdio from macb

[~andy/linux] / drivers / net / Space.c

diff --git a/drivers/net/Space.c b/drivers/net/Space.c
index 88bbd8ffa7fe739d0814c3da55e3b64429021d0d..e3f0faca98d02e7a2002ad5d076274a6ee38b2b4 100644 (file)
--- a/drivers/net/Space.c
+++ b/drivers/net/Space.c
@@ -29,7 +29,6 @@
  */
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
-#include <linux/trdevice.h>
 #include <linux/errno.h>
 #include <linux/init.h>
 #include <linux/netlink.h>
@@ -134,22 +133,9 @@ static struct devprobe2 eisa_probes[] __initdata = {
        {NULL, 0},
 };
 
-static struct devprobe2 mca_probes[] __initdata = {
-#ifdef CONFIG_NE2_MCA
-       {ne2_probe, 0},
-#endif
-#ifdef CONFIG_ELMC             /* 3c523 */
-       {elmc_probe, 0},
-#endif
-#ifdef CONFIG_ELMC_II          /* 3c527 */
-       {mc32_probe, 0},
-#endif
-       {NULL, 0},
-};
-
 /*
  * ISA probes that touch addresses < 0x400 (including those that also
- * look for EISA/PCI/MCA cards in addition to ISA cards).
+ * look for EISA/PCI cards in addition to ISA cards).
  */
 static struct devprobe2 isa_probes[] __initdata = {
 #if defined(CONFIG_HP100) && defined(CONFIG_ISA)       /* ISA, EISA */
@@ -279,51 +265,10 @@ static void __init ethif_probe2(int unit)
 
        (void)( probe_list2(unit, m68k_probes, base_addr == 0) &&
                probe_list2(unit, eisa_probes, base_addr == 0) &&
-               probe_list2(unit, mca_probes, base_addr == 0) &&
                probe_list2(unit, isa_probes, base_addr == 0) &&
                probe_list2(unit, parport_probes, base_addr == 0));
 }
 
-#ifdef CONFIG_TR
-/* Token-ring device probe */
-extern int ibmtr_probe_card(struct net_device *);
-extern struct net_device *smctr_probe(int unit);
-
-static struct devprobe2 tr_probes2[] __initdata = {
-#ifdef CONFIG_SMCTR
-       {smctr_probe, 0},
-#endif
-       {NULL, 0},
-};
-
-static __init int trif_probe(int unit)
-{
-       int err = -ENODEV;
-#ifdef CONFIG_IBMTR
-       struct net_device *dev = alloc_trdev(0);
-       if (!dev)
-               return -ENOMEM;
-
-       sprintf(dev->name, "tr%d", unit);
-       netdev_boot_setup_check(dev);
-       err = ibmtr_probe_card(dev);
-       if (err)
-               free_netdev(dev);
-#endif
-       return err;
-}
-
-static void __init trif_probe2(int unit)
-{
-       unsigned long base_addr = netdev_boot_base("tr", unit);
-
-       if (base_addr == 1)
-               return;
-       probe_list2(unit, tr_probes2, base_addr == 0);
-}
-#endif
-
-
 /*  Statically configured drivers -- order matters here. */
 static int __init net_olddevs_init(void)
 {
@@ -332,11 +277,6 @@ static int __init net_olddevs_init(void)
 #ifdef CONFIG_SBNI
        for (num = 0; num < 8; ++num)
                sbni_probe(num);
-#endif
-#ifdef CONFIG_TR
-       for (num = 0; num < 8; ++num)
-               if (!trif_probe(num))
-                       trif_probe2(num);
 #endif
        for (num = 0; num < 8; ++num)
                ethif_probe2(num);