diff options
| author | David S. Miller <davem@davemloft.net> | 2011-09-21 20:44:50 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-09-21 20:44:50 -0400 |
| commit | b7a17c0d846aab9f0e5d1dd3d005152c4ce459aa (patch) | |
| tree | 0edaae4e84b8f98ea98316581d61f6dc73ce6bba /drivers | |
| parent | 38034518c086fc48232b641cab97396a615864d0 (diff) | |
| parent | ce43aa6c142d69820a267431ea342d1bd9f6d3ce (diff) | |
Merge branch 'master' of github.com:davem330/net-next
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ethernet/apple/macmace.c | 9 | ||||
| -rw-r--r-- | drivers/net/ethernet/natsemi/macsonic.c | 9 | ||||
| -rw-r--r-- | drivers/net/ethernet/smsc/smsc911x.c | 2 |
3 files changed, 3 insertions, 17 deletions
diff --git a/drivers/net/ethernet/apple/macmace.c b/drivers/net/ethernet/apple/macmace.c index 6cd3f8646dc..7cf81bbffe0 100644 --- a/drivers/net/ethernet/apple/macmace.c +++ b/drivers/net/ethernet/apple/macmace.c @@ -31,9 +31,8 @@ #include <linux/dma-mapping.h> #include <linux/platform_device.h> #include <linux/gfp.h> +#include <linux/interrupt.h> #include <asm/io.h> -#include <asm/irq.h> -#include <asm/macintosh.h> #include <asm/macints.h> #include <asm/mac_psc.h> #include <asm/page.h> @@ -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 5c36948e54d..a2eacbfb425 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 diff --git a/drivers/net/ethernet/smsc/smsc911x.c b/drivers/net/ethernet/smsc/smsc911x.c index 788c4fdab9c..a3aa4c0e87f 100644 --- a/drivers/net/ethernet/smsc/smsc911x.c +++ b/drivers/net/ethernet/smsc/smsc911x.c @@ -2121,6 +2121,8 @@ static int __devinit smsc911x_probe_config_dt( of_property_read_u32(np, "reg-io-width", &width); if (width == 4) config->flags |= SMSC911X_USE_32BIT; + else + config->flags |= SMSC911X_USE_16BIT; if (of_get_property(np, "smsc,irq-active-high", NULL)) config->irq_polarity = SMSC911X_IRQ_POLARITY_ACTIVE_HIGH; |