diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2008-05-30 16:30:51 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2008-05-30 16:30:51 +0000 |
| commit | 0d62d39c21daa3d3ee6f974ccf3e3ab3008d79c2 (patch) | |
| tree | 5e3bc42552316a5cdaf8eee331305ff7b55c7bad /target/linux/generic-2.6/patches-2.6.25/610-phy_detect.patch | |
| parent | 2004a63a81f73ab8d3b926815a11119b5b81c071 (diff) | |
| download | upstream-0d62d39c21daa3d3ee6f974ccf3e3ab3008d79c2.tar.gz upstream-0d62d39c21daa3d3ee6f974ccf3e3ab3008d79c2.tar.bz2 upstream-0d62d39c21daa3d3ee6f974ccf3e3ab3008d79c2.zip | |
refresh generic 2.6.25 patches to match upstream style
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11296 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.patch | 16 |
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; |