diff --git a/drivers/net/ethernet/apple/macmace.c b/drivers/net/ethernet/apple/macmace.c index 6cd3f8646dcddf9e1377e16e60c2c3653e5f7c72..7cf81bbffe0e6121689514bcc965d6024701f585 100644 --- a/drivers/net/ethernet/apple/macmace.c +++ b/drivers/net/ethernet/apple/macmace.c @@ -31,9 +31,8 @@ #include #include #include +#include #include -#include -#include #include #include #include @@ -203,14 +202,8 @@ static int __devinit mace_probe(struct platform_device *pdev) unsigned char *addr; struct net_device *dev; unsigned char checksum = 0; - static int found = 0; int err; - if (found || macintosh_config->ether_type != MAC_ETHER_MACE) - return -ENODEV; - - found = 1; /* prevent 'finding' one on every device probe */ - dev = alloc_etherdev(PRIV_BYTES); if (!dev) return -ENOMEM; diff --git a/drivers/net/ethernet/natsemi/macsonic.c b/drivers/net/ethernet/natsemi/macsonic.c index 5c36948e54d74862d149e857ac34f6f22dbae0c7..a2eacbfb4252fa0f8da5dee5928abc380f3a11e0 100644 --- a/drivers/net/ethernet/natsemi/macsonic.c +++ b/drivers/net/ethernet/natsemi/macsonic.c @@ -313,22 +313,13 @@ static void __devinit mac_onboard_sonic_ethernet_addr(struct net_device *dev) static int __devinit mac_onboard_sonic_probe(struct net_device *dev) { - /* Bwahahaha */ - static int once_is_more_than_enough; struct sonic_local* lp = netdev_priv(dev); int sr; int commslot = 0; - if (once_is_more_than_enough) - return -ENODEV; - once_is_more_than_enough = 1; - if (!MACH_IS_MAC) return -ENODEV; - if (macintosh_config->ether_type != MAC_ETHER_SONIC) - return -ENODEV; - printk(KERN_INFO "Checking for internal Macintosh ethernet (SONIC).. "); /* Bogus probing, on the models which may or may not have