diff options
Diffstat (limited to 'drivers/net/phy')
| -rw-r--r-- | drivers/net/phy/cicada.c | 1 | ||||
| -rw-r--r-- | drivers/net/phy/davicom.c | 1 | ||||
| -rw-r--r-- | drivers/net/phy/lxt.c | 1 | ||||
| -rw-r--r-- | drivers/net/phy/marvell.c | 1 | ||||
| -rw-r--r-- | drivers/net/phy/mdio_bus.c | 4 | ||||
| -rw-r--r-- | drivers/net/phy/phy.c | 1 | ||||
| -rw-r--r-- | drivers/net/phy/phy_device.c | 1 | ||||
| -rw-r--r-- | drivers/net/phy/qsemi.c | 1 |
8 files changed, 3 insertions, 8 deletions
diff --git a/drivers/net/phy/cicada.c b/drivers/net/phy/cicada.c index c47fb2ecd14..7d8d534255c 100644 --- a/drivers/net/phy/cicada.c +++ b/drivers/net/phy/cicada.c @@ -29,7 +29,6 @@ #include <linux/spinlock.h> #include <linux/mm.h> #include <linux/module.h> -#include <linux/version.h> #include <linux/mii.h> #include <linux/ethtool.h> #include <linux/phy.h> diff --git a/drivers/net/phy/davicom.c b/drivers/net/phy/davicom.c index 6caf499fae3..5e9002e444c 100644 --- a/drivers/net/phy/davicom.c +++ b/drivers/net/phy/davicom.c @@ -29,7 +29,6 @@ #include <linux/spinlock.h> #include <linux/mm.h> #include <linux/module.h> -#include <linux/version.h> #include <linux/mii.h> #include <linux/ethtool.h> #include <linux/phy.h> diff --git a/drivers/net/phy/lxt.c b/drivers/net/phy/lxt.c index 4c840448ec8..bef79e454c3 100644 --- a/drivers/net/phy/lxt.c +++ b/drivers/net/phy/lxt.c @@ -29,7 +29,6 @@ #include <linux/spinlock.h> #include <linux/mm.h> #include <linux/module.h> -#include <linux/version.h> #include <linux/mii.h> #include <linux/ethtool.h> #include <linux/phy.h> diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index 4a72b025006..a2d6386d13b 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c @@ -29,7 +29,6 @@ #include <linux/spinlock.h> #include <linux/mm.h> #include <linux/module.h> -#include <linux/version.h> #include <linux/mii.h> #include <linux/ethtool.h> #include <linux/phy.h> diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c index ad93b0da87f..02940c0fef6 100644 --- a/drivers/net/phy/mdio_bus.c +++ b/drivers/net/phy/mdio_bus.c @@ -29,7 +29,6 @@ #include <linux/spinlock.h> #include <linux/mm.h> #include <linux/module.h> -#include <linux/version.h> #include <linux/mii.h> #include <linux/ethtool.h> #include <linux/phy.h> @@ -61,6 +60,9 @@ int mdiobus_register(struct mii_bus *bus) for (i = 0; i < PHY_MAX_ADDR; i++) { struct phy_device *phydev; + if (bus->phy_mask & (1 << i)) + continue; + phydev = get_phy_device(bus, i); if (IS_ERR(phydev)) diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 9209da9dde0..b8686e47f89 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -30,7 +30,6 @@ #include <linux/spinlock.h> #include <linux/mm.h> #include <linux/module.h> -#include <linux/version.h> #include <linux/mii.h> #include <linux/ethtool.h> #include <linux/phy.h> diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 6da1aa0706a..16bebe7a7ce 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -30,7 +30,6 @@ #include <linux/spinlock.h> #include <linux/mm.h> #include <linux/module.h> -#include <linux/version.h> #include <linux/mii.h> #include <linux/ethtool.h> #include <linux/phy.h> diff --git a/drivers/net/phy/qsemi.c b/drivers/net/phy/qsemi.c index d461ba45763..65d995b02b2 100644 --- a/drivers/net/phy/qsemi.c +++ b/drivers/net/phy/qsemi.c @@ -29,7 +29,6 @@ #include <linux/spinlock.h> #include <linux/mm.h> #include <linux/module.h> -#include <linux/version.h> #include <linux/mii.h> #include <linux/ethtool.h> #include <linux/phy.h> |