[cavium-octeon] update to 2.6.30-rc5

[openwrt.git] / target / linux / au1000 / patches-2.6.27 / 004-state_led_phy_fix.patch

diff --git a/target/linux/au1000/patches-2.6.27/004-state_led_phy_fix.patch b/target/linux/au1000/patches-2.6.27/004-state_led_phy_fix.patch
index 3e5a4eb..e681970 100644 (file)
--- a/target/linux/au1000/patches-2.6.27/004-state_led_phy_fix.patch
+++ b/target/linux/au1000/patches-2.6.27/004-state_led_phy_fix.patch
@@ -1,6 +1,6 @@
---- linux-2.6.27/drivers/net/au1000_eth.c      2008-10-18 22:37:52.000000000 +0200
-+++ linux-2.6.27.new/drivers/net/au1000_eth.c  2008-11-02 22:03:14.000000000 +0100
-@@ -187,6 +187,15 @@
+--- a/drivers/net/au1000_eth.c
++++ b/drivers/net/au1000_eth.c
+@@ -184,6 +184,15 @@ struct au1000_private *au_macs[NUM_ETH_I

  #  undef AU1XXX_PHY1_IRQ
  #endif
  
  #  undef AU1XXX_PHY1_IRQ
  #endif
  


@@ -16,7 +16,7 @@
  #if defined(AU1XXX_PHY0_BUSID) && (AU1XXX_PHY0_BUSID > 0)
  # error MAC0-associated PHY attached 2nd MACs MII bus not supported yet
  #endif
  #if defined(AU1XXX_PHY0_BUSID) && (AU1XXX_PHY0_BUSID > 0)
  # error MAC0-associated PHY attached 2nd MACs MII bus not supported yet
  #endif

-@@ -383,6 +392,12 @@
+@@ -380,6 +389,12 @@ static int mii_probe (struct net_device 

        aup->old_duplex = -1;
        aup->phy_dev = phydev;
  
        aup->old_duplex = -1;
        aup->phy_dev = phydev;