resync patch

[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 394cd37..87af641 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.16/drivers/net/phy/mdio_bus.c
-===================================================================
---- linux-2.6.23.16.orig/drivers/net/phy/mdio_bus.c    2008-02-11 07:06:32.000000000 +0100
-+++ linux-2.6.23.16/drivers/net/phy/mdio_bus.c 2008-04-20 01:55:46.000000000 +0200
+--- a/drivers/net/phy/mdio_bus.c
++++ b/drivers/net/phy/mdio_bus.c
 @@ -131,6 +131,9 @@
        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.16/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.16/include/linux/phy.h
-===================================================================
---- linux-2.6.23.16.orig/include/linux/phy.h   2008-04-20 00:36:18.000000000 +0200
-+++ linux-2.6.23.16/include/linux/phy.h        2008-04-20 01:55:04.000000000 +0200
+--- a/include/linux/phy.h
++++ b/include/linux/phy.h
 @@ -319,6 +319,11 @@
        u32 features;
        u32 flags;