[cavium-octeon] update to 2.6.30-rc5

[openwrt.git] / target / linux / generic-2.6 / patches-2.6.23 / 600-phy_extension.patch

diff --git a/target/linux/generic-2.6/patches-2.6.23/600-phy_extension.patch b/target/linux/generic-2.6/patches-2.6.23/600-phy_extension.patch
index 8261d4a..b2d36a3 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.23/600-phy_extension.patch
+++ b/target/linux/generic-2.6/patches-2.6.23/600-phy_extension.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.23/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 @@
+--- a/drivers/net/phy/phy.c
++++ b/drivers/net/phy/phy.c
+@@ -344,6 +344,50 @@ int phy_ethtool_gset(struct phy_device *

  }
  EXPORT_SYMBOL(phy_ethtool_gset);
  
  }
  EXPORT_SYMBOL(phy_ethtool_gset);
  


@@ -53,11 +51,9 @@ Index: linux-2.6.23/drivers/net/phy/phy.c
  /**
   * phy_mii_ioctl - generic PHY MII ioctl interface
   * @phydev: the phy_device struct
  /**
   * phy_mii_ioctl - generic PHY MII ioctl interface
   * @phydev: the phy_device struct

-Index: linux-2.6.23/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 @@
+--- a/include/linux/phy.h
++++ b/include/linux/phy.h
+@@ -393,6 +393,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);
  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);