diff options
| author | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-10-24 13:05:22 +0000 |
|---|---|---|
| committer | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-10-24 13:05:22 +0000 |
| commit | eb0c0200624c487af549aca9eddb722413dbc1cd (patch) | |
| tree | b152afa6fd38537133c7a67e6aeff8476342d5a0 /target/linux/generic/patches-3.6/701-phy_extension.patch | |
| parent | 8b3c85ca8244eec0d01eea269922d780f73ccebb (diff) | |
[kernel] make all 3.6 patches apply and build
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33911 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.6/701-phy_extension.patch')
| -rw-r--r-- | target/linux/generic/patches-3.6/701-phy_extension.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-3.6/701-phy_extension.patch b/target/linux/generic/patches-3.6/701-phy_extension.patch index 201c857d2..45464ac75 100644 --- a/target/linux/generic/patches-3.6/701-phy_extension.patch +++ b/target/linux/generic/patches-3.6/701-phy_extension.patch @@ -1,6 +1,6 @@ --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c -@@ -299,6 +299,50 @@ int phy_ethtool_gset(struct phy_device * +@@ -301,6 +301,50 @@ int phy_ethtool_gset(struct phy_device * } EXPORT_SYMBOL(phy_ethtool_gset); @@ -51,7 +51,7 @@ /** * phy_mii_ioctl - generic PHY MII ioctl interface * @phydev: the phy_device struct -@@ -474,7 +518,7 @@ static void phy_force_reduction(struct p +@@ -476,7 +520,7 @@ static void phy_force_reduction(struct p int idx; idx = phy_find_setting(phydev->speed, phydev->duplex); @@ -62,7 +62,7 @@ idx = phy_find_valid(idx, phydev->supported); --- a/include/linux/phy.h +++ b/include/linux/phy.h -@@ -515,6 +515,7 @@ void phy_start_machine(struct phy_device +@@ -542,6 +542,7 @@ void phy_start_machine(struct phy_device void phy_stop_machine(struct phy_device *phydev); int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd); int phy_ethtool_gset(struct phy_device *phydev, struct ethtool_cmd *cmd); |