- new upstream kernel 2.6.28.5

[openwrt.git] / target / linux / generic-2.6 / patches-2.6.23 / 610-phy_detect.patch

diff --git a/target/linux/generic-2.6/patches-2.6.23/610-phy_detect.patch b/target/linux/generic-2.6/patches-2.6.23/610-phy_detect.patch
index c0dc2013bdf0d463df7e4085c53401afc0126a21..c56c00f59134f8cf05a985a87c6f2b6b072d0836 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.23/610-phy_detect.patch
+++ b/target/linux/generic-2.6/patches-2.6.23/610-phy_detect.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.23.17/drivers/net/phy/mdio_bus.c
-===================================================================
---- linux-2.6.23.17.orig/drivers/net/phy/mdio_bus.c
-+++ linux-2.6.23.17/drivers/net/phy/mdio_bus.c
+--- a/drivers/net/phy/mdio_bus.c
++++ b/drivers/net/phy/mdio_bus.c
 @@ -131,6 +131,9 @@ static int mdio_bus_match(struct device 
        struct phy_device *phydev = to_phy_device(dev);
        struct phy_driver *phydrv = to_phy_driver(drv);
@@ -12,10 +10,8 @@ Index: linux-2.6.23.17/drivers/net/phy/mdio_bus.c
        return ((phydrv->phy_id & phydrv->phy_id_mask) ==
                (phydev->phy_id & phydrv->phy_id_mask));
  }
-Index: linux-2.6.23.17/include/linux/phy.h
-===================================================================
---- linux-2.6.23.17.orig/include/linux/phy.h
-+++ linux-2.6.23.17/include/linux/phy.h
+--- a/include/linux/phy.h
++++ b/include/linux/phy.h
 @@ -319,6 +319,11 @@ struct phy_driver {
        u32 features;
        u32 flags;