From 7e856e5a97966fe89f6336783c0c676eb999e7cf Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Wed, 24 Oct 2012 13:05:22 +0000 Subject: make all 3.6 patches apply and build SVN-Revision: 33911 --- target/linux/generic/patches-3.6/701-phy_extension.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'target/linux/generic/patches-3.6/701-phy_extension.patch') 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 201c857d2f..45464ac753 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); -- cgit v1.2.3