summaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.25/610-phy_detect.patch
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-03-22 20:18:43 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-03-22 20:18:43 +0000
commit1685e6d7f084f0aba357818ec554e89cf9855e45 (patch)
tree4f1b163b74cc2a55e947827848444e035efd44ec /target/linux/generic-2.6/patches-2.6.25/610-phy_detect.patch
parenta285220c588bf91537659eb4f2a8b3a15fa3b53d (diff)
remove custom phy layer patches from older kernels where they are not needed
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14978 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.25/610-phy_detect.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/610-phy_detect.patch26
1 files changed, 0 insertions, 26 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.25/610-phy_detect.patch b/target/linux/generic-2.6/patches-2.6.25/610-phy_detect.patch
deleted file mode 100644
index 9fa7bb2fe..000000000
--- a/target/linux/generic-2.6/patches-2.6.25/610-phy_detect.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/drivers/net/phy/mdio_bus.c
-+++ b/drivers/net/phy/mdio_bus.c
-@@ -132,6 +132,9 @@ static int mdio_bus_match(struct device
- struct phy_device *phydev = to_phy_device(dev);
- struct phy_driver *phydrv = to_phy_driver(drv);
-
-+ if (phydrv->detect)
-+ return (phydrv->detect(phydev->bus, phydev->addr));
-+
- return ((phydrv->phy_id & phydrv->phy_id_mask) ==
- (phydev->phy_id & phydrv->phy_id_mask));
- }
---- a/include/linux/phy.h
-+++ b/include/linux/phy.h
-@@ -325,6 +325,11 @@ struct phy_driver {
- u32 features;
- u32 flags;
-
-+ /* Called during discovery to test if the
-+ * device can attach to the bus, even if
-+ * phy id and mask do not match */
-+ bool (*detect)(struct mii_bus *bus, int addr);
-+
- /* Called to initialize the PHY,
- * including after a reset */
- int (*config_init)(struct phy_device *phydev);