aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.25/610-phy_detect.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2008-05-18 20:26:43 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-05-18 20:26:43 +0000
commit9cddfcdc4c0fad3a51ccee7658287b25c9a8e5e1 (patch)
tree0309a22e623c2951728c6b2392e7426751bd1c07 /target/linux/generic-2.6/patches-2.6.25/610-phy_detect.patch
parent8b79a7713bb0408908bb319d408d6e92d78e46fa (diff)
downloadupstream-9cddfcdc4c0fad3a51ccee7658287b25c9a8e5e1.tar.gz
upstream-9cddfcdc4c0fad3a51ccee7658287b25c9a8e5e1.tar.bz2
upstream-9cddfcdc4c0fad3a51ccee7658287b25c9a8e5e1.zip
[kernel] refresh generic 2.6.25 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11189 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.patch16
1 files changed, 8 insertions, 8 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
index 454415341f..6fb6852d8a 100644
--- 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,8 @@
-Index: linux-2.6.25.1/drivers/net/phy/mdio_bus.c
+Index: linux-2.6.25.4/drivers/net/phy/mdio_bus.c
===================================================================
---- linux-2.6.25.1.orig/drivers/net/phy/mdio_bus.c 2008-05-01 23:45:25.000000000 +0200
-+++ linux-2.6.25.1/drivers/net/phy/mdio_bus.c 2008-05-12 23:44:21.000000000 +0200
-@@ -132,6 +132,9 @@
+--- 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
struct phy_device *phydev = to_phy_device(dev);
struct phy_driver *phydrv = to_phy_driver(drv);
@@ -12,11 +12,11 @@ Index: linux-2.6.25.1/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.1/include/linux/phy.h
+Index: linux-2.6.25.4/include/linux/phy.h
===================================================================
---- linux-2.6.25.1.orig/include/linux/phy.h 2008-05-01 23:45:25.000000000 +0200
-+++ linux-2.6.25.1/include/linux/phy.h 2008-05-12 23:44:21.000000000 +0200
-@@ -325,6 +325,11 @@
+--- 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 {
u32 features;
u32 flags;