[cavium-octeon] update to 2.6.30-rc5

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

diff --git a/target/linux/generic-2.6/patches-2.6.30/600-phy_extension.patch b/target/linux/generic-2.6/patches-2.6.30/600-phy_extension.patch
index 990d3cd..72a4fa5 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.30/600-phy_extension.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/600-phy_extension.patch
@@ -73,7 +73,7 @@
        idx = phy_find_valid(idx, phydev->supported);
 --- a/include/linux/phy.h
 +++ b/include/linux/phy.h
        idx = phy_find_valid(idx, phydev->supported);
 --- a/include/linux/phy.h
 +++ b/include/linux/phy.h

-@@ -477,6 +477,7 @@ void phy_start_machine(struct phy_device
+@@ -483,6 +483,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);