kernel: fix build with kernel 2.6.34-rc4

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

diff --git a/target/linux/au1000/patches-2.6.32/004-state_led_phy_fix.patch b/target/linux/au1000/patches-2.6.32/004-state_led_phy_fix.patch
index cfaea00..66b511b 100644 (file)
--- a/target/linux/au1000/patches-2.6.32/004-state_led_phy_fix.patch
+++ b/target/linux/au1000/patches-2.6.32/004-state_led_phy_fix.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/au1000_eth.c
 +++ b/drivers/net/au1000_eth.c
 --- a/drivers/net/au1000_eth.c
 +++ b/drivers/net/au1000_eth.c

-@@ -166,6 +166,15 @@ struct au1000_private *au_macs[NUM_ETH_I
+@@ -167,6 +167,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

-@@ -483,6 +492,12 @@ static int mii_probe (struct net_device 
+@@ -484,6 +493,12 @@ static int mii_probe (struct net_device 

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