[kernel] generic-2.6: Backport netfilter includes fix from 2.6.26 to 2.6.25

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

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
index 6fb6852..cda40d8 100644 (file)
--- 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
@@ -1,8 +1,6 @@
-Index: linux-2.6.25.4/drivers/net/phy/mdio_bus.c
-===================================================================
---- linux-2.6.25.4.orig/drivers/net/phy/mdio_bus.c
-+++ linux-2.6.25.4/drivers/net/phy/mdio_bus.c
-@@ -132,6 +132,9 @@ static int mdio_bus_match(struct device 
+--- a/drivers/net/phy/mdio_bus.c
++++ b/drivers/net/phy/mdio_bus.c
+@@ -132,6 +132,9 @@
        struct phy_device *phydev = to_phy_device(dev);
        struct phy_driver *phydrv = to_phy_driver(drv);
  
@@ -12,11 +10,9 @@ Index: linux-2.6.25.4/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.25.4/include/linux/phy.h
-===================================================================
---- linux-2.6.25.4.orig/include/linux/phy.h
-+++ linux-2.6.25.4/include/linux/phy.h
-@@ -325,6 +325,11 @@ struct phy_driver {
+--- a/include/linux/phy.h
++++ b/include/linux/phy.h
+@@ -325,6 +325,11 @@
        u32 features;
        u32 flags;