summaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.25/610-phy_detect.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2008-05-30 16:30:51 +0000
committerImre Kaloz <kaloz@openwrt.org>2008-05-30 16:30:51 +0000
commitf664b7cb17d20e7a32e9bd07e85c9bb7ecb9e2ce (patch)
treeeee31435ae91d4838abf2a566762712522a30f1f /target/linux/generic-2.6/patches-2.6.25/610-phy_detect.patch
parent83072a149a7d7e6faf7276db7a5f6440d7fa0d24 (diff)
downloadmaster-31e0f0ae-f664b7cb17d20e7a32e9bd07e85c9bb7ecb9e2ce.tar.gz
master-31e0f0ae-f664b7cb17d20e7a32e9bd07e85c9bb7ecb9e2ce.tar.bz2
master-31e0f0ae-f664b7cb17d20e7a32e9bd07e85c9bb7ecb9e2ce.zip
refresh generic 2.6.25 patches to match upstream style
SVN-Revision: 11296
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, 6 insertions, 10 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 6fb6852d8a..cda40d88be 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,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;