kernel: upgrade to 2.6.30.8 and refresh patches

[openwrt/svn-archive/archive.git] / target / linux / au1000 / patches-2.6.30 / 004-state_led_phy_fix.patch

diff --git a/target/linux/au1000/patches-2.6.30/004-state_led_phy_fix.patch b/target/linux/au1000/patches-2.6.30/004-state_led_phy_fix.patch
index e681970c5b5010e4b2dab03c565789c960d78ef7..cfaea00e2802910041bde2e93a5cf41d979d1661 100644 (file)
--- a/target/linux/au1000/patches-2.6.30/004-state_led_phy_fix.patch
+++ b/target/linux/au1000/patches-2.6.30/004-state_led_phy_fix.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/au1000_eth.c
 +++ b/drivers/net/au1000_eth.c
-@@ -184,6 +184,15 @@ struct au1000_private *au_macs[NUM_ETH_I
+@@ -166,6 +166,15 @@ struct au1000_private *au_macs[NUM_ETH_I
  #  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
-@@ -380,6 +389,12 @@ static int mii_probe (struct net_device 
+@@ -483,6 +492,12 @@ static int mii_probe (struct net_device 
        aup->old_duplex = -1;
        aup->phy_dev = phydev;
  
@@ -27,5 +27,5 @@
 +#endif
 +
        printk(KERN_INFO "%s: attached PHY driver [%s] "
-              "(mii_bus:phy_addr=%s, irq=%d)\n",
-              dev->name, phydev->drv->name, phydev->dev.bus_id, phydev->irq);
+              "(mii_bus:phy_addr=%s, irq=%d)\n", dev->name,
+              phydev->drv->name, dev_name(&phydev->dev), phydev->irq);