refresh generic 2.6.23 patches in upstream style
SVN-Revision: 11366
This commit is contained in:
@@ -1,8 +1,6 @@
|
||||
Index: linux-2.6.23.17/drivers/net/phy/phy.c
|
||||
===================================================================
|
||||
--- linux-2.6.23.17.orig/drivers/net/phy/phy.c
|
||||
+++ linux-2.6.23.17/drivers/net/phy/phy.c
|
||||
@@ -344,6 +344,50 @@ int phy_ethtool_gset(struct phy_device *
|
||||
--- a/drivers/net/phy/phy.c
|
||||
+++ b/drivers/net/phy/phy.c
|
||||
@@ -344,6 +344,50 @@
|
||||
}
|
||||
EXPORT_SYMBOL(phy_ethtool_gset);
|
||||
|
||||
@@ -53,11 +51,9 @@ Index: linux-2.6.23.17/drivers/net/phy/phy.c
|
||||
/**
|
||||
* phy_mii_ioctl - generic PHY MII ioctl interface
|
||||
* @phydev: the phy_device struct
|
||||
Index: linux-2.6.23.17/include/linux/phy.h
|
||||
===================================================================
|
||||
--- linux-2.6.23.17.orig/include/linux/phy.h
|
||||
+++ linux-2.6.23.17/include/linux/phy.h
|
||||
@@ -393,6 +393,7 @@ void phy_start_machine(struct phy_device
|
||||
--- a/include/linux/phy.h
|
||||
+++ b/include/linux/phy.h
|
||||
@@ -393,6 +393,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);
|
||||
|
||||
Reference in New Issue
Block a user