aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-2.6.35/601-phy-add-aneg-done-function.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2010-07-17 14:10:39 +0000
committerHauke Mehrtens <hauke@openwrt.org>2010-07-17 14:10:39 +0000
commit5272f096fb0541852734245658d3247cc1395d2f (patch)
tree8d1c382840f7148dc13b1f9ca30e753adb61a929 /target/linux/generic/patches-2.6.35/601-phy-add-aneg-done-function.patch
parent3770e0e7facafd3c2f9d0a73b5e1b93c97affc97 (diff)
downloadupstream-5272f096fb0541852734245658d3247cc1395d2f.tar.gz
upstream-5272f096fb0541852734245658d3247cc1395d2f.tar.bz2
upstream-5272f096fb0541852734245658d3247cc1395d2f.zip
kernel: refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22252 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-2.6.35/601-phy-add-aneg-done-function.patch')
-rw-r--r--target/linux/generic/patches-2.6.35/601-phy-add-aneg-done-function.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-2.6.35/601-phy-add-aneg-done-function.patch b/target/linux/generic/patches-2.6.35/601-phy-add-aneg-done-function.patch
index aac38ff2e7..f64ecea245 100644
--- a/target/linux/generic/patches-2.6.35/601-phy-add-aneg-done-function.patch
+++ b/target/linux/generic/patches-2.6.35/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 {
+@@ -384,9 +384,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
+@@ -710,6 +710,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;