ar71xx: merge latest ag71xx changes from trunk, fix wrong argument to phy_mii_ioctl()

[openwrt-10.03/.git] / target / linux / ar71xx / files / drivers / net / ag71xx / ag71xx_ethtool.c

diff --git a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_ethtool.c b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_ethtool.c
index 878be77c9d9a7af68209128d337050d49a19facf..1f1c6aa77686c49bc1d01349c9b5dd81716c691c 100644 (file)
--- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_ethtool.c
+++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_ethtool.c
@@ -1,7 +1,7 @@
 /*
  *  Atheros AR71xx built-in ethernet mac driver
  *
- *  Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
  *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
  *
  *  Based on Atheros' AG7100 driver
@@ -44,7 +44,7 @@ static void ag71xx_ethtool_get_drvinfo(struct net_device *dev,
 
        strcpy(info->driver, ag->pdev->dev.driver->name);
        strcpy(info->version, AG71XX_DRV_VERSION);
-       strcpy(info->bus_info, ag->pdev->dev.bus_id);
+       strcpy(info->bus_info, dev_name(&ag->pdev->dev));
 }
 
 static u32 ag71xx_ethtool_get_msglevel(struct net_device *dev)