aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.25/600-phy_extension.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2008-05-02 10:17:03 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-05-02 10:17:03 +0000
commit1d4db4520ab1c4e7472a48d14ec641e2ef074b6b (patch)
treeb992b5d551457de6a5d6f53b37b9eec182c68c29 /target/linux/generic-2.6/patches-2.6.25/600-phy_extension.patch
parent5c09219b13a1f3695729cc24ac7e8390859a406f (diff)
downloadmaster-187ad058-1d4db4520ab1c4e7472a48d14ec641e2ef074b6b.tar.gz
master-187ad058-1d4db4520ab1c4e7472a48d14ec641e2ef074b6b.tar.bz2
master-187ad058-1d4db4520ab1c4e7472a48d14ec641e2ef074b6b.zip
[kernel] update to 2.6.25.1 and refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11006 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.25/600-phy_extension.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/600-phy_extension.patch16
1 files changed, 8 insertions, 8 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.25/600-phy_extension.patch b/target/linux/generic-2.6/patches-2.6.25/600-phy_extension.patch
index 8261d4a481..c80696f092 100644
--- a/target/linux/generic-2.6/patches-2.6.25/600-phy_extension.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/600-phy_extension.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.23/drivers/net/phy/phy.c
+Index: linux-2.6.25.1/drivers/net/phy/phy.c
===================================================================
---- linux-2.6.23.orig/drivers/net/phy/phy.c 2007-10-14 00:05:26.000000000 +0200
-+++ linux-2.6.23/drivers/net/phy/phy.c 2007-10-14 00:44:21.000000000 +0200
-@@ -344,6 +344,50 @@
+--- linux-2.6.25.1.orig/drivers/net/phy/phy.c
++++ linux-2.6.25.1/drivers/net/phy/phy.c
+@@ -348,6 +348,50 @@ int phy_ethtool_gset(struct phy_device *
}
EXPORT_SYMBOL(phy_ethtool_gset);
@@ -53,11 +53,11 @@ Index: linux-2.6.23/drivers/net/phy/phy.c
/**
* phy_mii_ioctl - generic PHY MII ioctl interface
* @phydev: the phy_device struct
-Index: linux-2.6.23/include/linux/phy.h
+Index: linux-2.6.25.1/include/linux/phy.h
===================================================================
---- linux-2.6.23.orig/include/linux/phy.h 2007-10-14 00:05:15.000000000 +0200
-+++ linux-2.6.23/include/linux/phy.h 2007-10-14 00:18:54.000000000 +0200
-@@ -393,6 +393,7 @@
+--- linux-2.6.25.1.orig/include/linux/phy.h
++++ linux-2.6.25.1/include/linux/phy.h
+@@ -399,6 +399,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);