diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-28 16:29:51 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-28 16:29:51 -0400 |
| commit | ed40d0c472b136682b2fcba05f89762859c7374f (patch) | |
| tree | 076b83a26bcd63d6158463735dd34c10bbc591dc /drivers/net/arm/ks8695net.c | |
| parent | 9e495834e59ca9b29f1a1f63b9f5533bb022ac49 (diff) | |
| parent | 5d80f8e5a9dc9c9a94d4aeaa567e219a808b8a4a (diff) | |
Merge branch 'origin' into devel
Conflicts:
sound/soc/pxa/pxa2xx-i2s.c
Diffstat (limited to 'drivers/net/arm/ks8695net.c')
| -rw-r--r-- | drivers/net/arm/ks8695net.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/arm/ks8695net.c b/drivers/net/arm/ks8695net.c index f3a127434897..35cd264abae7 100644 --- a/drivers/net/arm/ks8695net.c +++ b/drivers/net/arm/ks8695net.c | |||
| @@ -1059,7 +1059,7 @@ ks8695_get_drvinfo(struct net_device *ndev, struct ethtool_drvinfo *info) | |||
| 1059 | { | 1059 | { |
| 1060 | strlcpy(info->driver, MODULENAME, sizeof(info->driver)); | 1060 | strlcpy(info->driver, MODULENAME, sizeof(info->driver)); |
| 1061 | strlcpy(info->version, MODULEVERSION, sizeof(info->version)); | 1061 | strlcpy(info->version, MODULEVERSION, sizeof(info->version)); |
| 1062 | strlcpy(info->bus_info, ndev->dev.parent->bus_id, | 1062 | strlcpy(info->bus_info, dev_name(ndev->dev.parent), |
| 1063 | sizeof(info->bus_info)); | 1063 | sizeof(info->bus_info)); |
| 1064 | } | 1064 | } |
| 1065 | 1065 | ||