summaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.34/601-phy-add-aneg-done-function.patch
diff options
context:
space:
mode:
authorflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-06-12 18:10:09 +0000
committerflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-06-12 18:10:09 +0000
commitf6f5bd186636bc79631354a172d2be376f77fc7d (patch)
tree9beb7e65949613a72f1a556294d0208d649d8f14 /target/linux/generic-2.6/patches-2.6.34/601-phy-add-aneg-done-function.patch
parentcb1d5f3bc9d039e0643388762a63cfb9840d2ca9 (diff)
[kernel] refresh 2.6.34 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21768 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.34/601-phy-add-aneg-done-function.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.34/601-phy-add-aneg-done-function.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.34/601-phy-add-aneg-done-function.patch b/target/linux/generic-2.6/patches-2.6.34/601-phy-add-aneg-done-function.patch
index aac38ff2e..8f939a5b7 100644
--- a/target/linux/generic-2.6/patches-2.6.34/601-phy-add-aneg-done-function.patch
+++ b/target/linux/generic-2.6/patches-2.6.34/601-phy-add-aneg-done-function.patch
@@ -1,6 +1,6 @@
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
-@@ -393,9 +393,18 @@ struct phy_driver {
+@@ -379,9 +379,18 @@ struct phy_driver {
*/
int (*config_aneg)(struct phy_device *phydev);
@@ -21,7 +21,7 @@
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
-@@ -695,6 +695,9 @@ int genphy_update_link(struct phy_device
+@@ -698,6 +698,9 @@ int genphy_update_link(struct phy_device
{
int status;
@@ -33,7 +33,7 @@
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
-@@ -107,6 +107,9 @@ static inline int phy_aneg_done(struct p
+@@ -106,6 +106,9 @@ static inline int phy_aneg_done(struct p
{
int retval;