From 07d684e3c5e13bfa8fcc5757d00d7fbb1de24dee Mon Sep 17 00:00:00 2001 From: Nicolas Ferre Date: Wed, 31 Oct 2012 06:04:53 +0000 Subject: [PATCH] --- yaml --- r: 340583 b: refs/heads/master c: 83cdbc7da7a9b6d5413c27ebb05cf6d505469462 h: refs/heads/master i: 340581: e57e6d4a3f6b9b351248c72e3c8b86d0edc899ad 340579: 8b5877722d959cb96820e76a200990401b94baa4 340575: e050822683f1819d614d64f0282ced2ee030a310 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/cadence/macb.c | 11 ----------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/[refs] b/[refs] index 11613ce688c9..d7cbb72f43bc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a268adb1c848c90c8adfafdf647b0d8d8f90eaff +refs/heads/master: 83cdbc7da7a9b6d5413c27ebb05cf6d505469462 diff --git a/trunk/drivers/net/ethernet/cadence/macb.c b/trunk/drivers/net/ethernet/cadence/macb.c index b161d7318e29..4db52f318efe 100644 --- a/trunk/drivers/net/ethernet/cadence/macb.c +++ b/trunk/drivers/net/ethernet/cadence/macb.c @@ -1225,20 +1225,9 @@ static int macb_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) return phy_ethtool_sset(phydev, cmd); } -static void macb_get_drvinfo(struct net_device *dev, - struct ethtool_drvinfo *info) -{ - struct macb *bp = netdev_priv(dev); - - strcpy(info->driver, bp->pdev->dev.driver->name); - strcpy(info->version, "$Revision: 1.14 $"); - strcpy(info->bus_info, dev_name(&bp->pdev->dev)); -} - const struct ethtool_ops macb_ethtool_ops = { .get_settings = macb_get_settings, .set_settings = macb_set_settings, - .get_drvinfo = macb_get_drvinfo, .get_link = ethtool_op_get_link, .get_ts_info = ethtool_op_get_ts_info, };