git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
bmac.c
diff --git
a/drivers/net/bmac.c
b/drivers/net/bmac.c
index 8a546a33d58124fb39cf67ff673e305f7a7fd418..1ab58375d0617039cfdf658d7ee8c56f0f6bbf09 100644
(file)
--- a/
drivers/net/bmac.c
+++ b/
drivers/net/bmac.c
@@
-1240,7
+1240,7
@@
static void bmac_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *inf
{
struct bmac_data *bp = netdev_priv(dev);
strcpy(info->driver, "bmac");
- strcpy(info->bus_info,
bp->mdev->ofdev.dev.bus_id
);
+ strcpy(info->bus_info,
dev_name(&bp->mdev->ofdev.dev)
);
}
static const struct ethtool_ops bmac_ethtool_ops = {