aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.24/600-phy_extension.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2008-05-30 17:19:24 +0000
committerImre Kaloz <kaloz@openwrt.org>2008-05-30 17:19:24 +0000
commitf6d815a2839a1dcecba7132ce8499e41fc878dfc (patch)
tree253cbe10bc6569ef56223632eed27a179e447946 /target/linux/generic-2.6/patches-2.6.24/600-phy_extension.patch
parent41ccd65d1af59a115e5e03c995f69966ef19d66c (diff)
downloadupstream-f6d815a2839a1dcecba7132ce8499e41fc878dfc.tar.gz
upstream-f6d815a2839a1dcecba7132ce8499e41fc878dfc.tar.bz2
upstream-f6d815a2839a1dcecba7132ce8499e41fc878dfc.zip
refresh generic 2.6.24 patches to match upstream style
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11302 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.24/600-phy_extension.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.24/600-phy_extension.patch16
1 files changed, 6 insertions, 10 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.24/600-phy_extension.patch b/target/linux/generic-2.6/patches-2.6.24/600-phy_extension.patch
index b63b92bd0d..3150f5809c 100644
--- a/target/linux/generic-2.6/patches-2.6.24/600-phy_extension.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/600-phy_extension.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.24.7/drivers/net/phy/phy.c
-===================================================================
---- linux-2.6.24.7.orig/drivers/net/phy/phy.c
-+++ linux-2.6.24.7/drivers/net/phy/phy.c
-@@ -345,6 +345,50 @@ int phy_ethtool_gset(struct phy_device *
+--- a/drivers/net/phy/phy.c
++++ b/drivers/net/phy/phy.c
+@@ -345,6 +345,50 @@
}
EXPORT_SYMBOL(phy_ethtool_gset);
@@ -53,11 +51,9 @@ Index: linux-2.6.24.7/drivers/net/phy/phy.c
/**
* phy_mii_ioctl - generic PHY MII ioctl interface
* @phydev: the phy_device struct
-Index: linux-2.6.24.7/include/linux/phy.h
-===================================================================
---- linux-2.6.24.7.orig/include/linux/phy.h
-+++ linux-2.6.24.7/include/linux/phy.h
-@@ -398,6 +398,7 @@ void phy_start_machine(struct phy_device
+--- a/include/linux/phy.h
++++ b/include/linux/phy.h
+@@ -398,6 +398,7 @@
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);