diff options
author | Florian Fainelli <florian@openwrt.org> | 2012-10-24 13:05:22 +0000 |
---|---|---|
committer | Florian Fainelli <florian@openwrt.org> | 2012-10-24 13:05:22 +0000 |
commit | dcde44e37ed89b02bf98c89c9d20eb7097e21707 (patch) | |
tree | b152afa6fd38537133c7a67e6aeff8476342d5a0 /target/linux/generic/patches-3.6/702-phy_add_aneg_done_function.patch | |
parent | 59d0f03c9af97f38ddb4b99d9a86fa845e1fe170 (diff) | |
download | upstream-dcde44e37ed89b02bf98c89c9d20eb7097e21707.tar.gz upstream-dcde44e37ed89b02bf98c89c9d20eb7097e21707.tar.bz2 upstream-dcde44e37ed89b02bf98c89c9d20eb7097e21707.zip |
[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/702-phy_add_aneg_done_function.patch')
-rw-r--r-- | target/linux/generic/patches-3.6/702-phy_add_aneg_done_function.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-3.6/702-phy_add_aneg_done_function.patch b/target/linux/generic/patches-3.6/702-phy_add_aneg_done_function.patch index 0649afb10a..8e4443604f 100644 --- a/target/linux/generic/patches-3.6/702-phy_add_aneg_done_function.patch +++ b/target/linux/generic/patches-3.6/702-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 { +@@ -408,9 +408,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 -@@ -705,6 +705,9 @@ int genphy_update_link(struct phy_device +@@ -796,6 +796,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 -@@ -106,6 +106,9 @@ static inline int phy_aneg_done(struct p +@@ -108,6 +108,9 @@ static inline int phy_aneg_done(struct p { int retval; |