diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-11 10:11:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-11 10:11:40 -0700 |
| commit | 9fc282baa8f743a7049e301d13cf9968ee95a91c (patch) | |
| tree | d34e827ed35c21b98eb4e3d4c3731d1da54fa03a /drivers/net/phy | |
| parent | c61ea31dac0319ec64b33725917bda81fc293a25 (diff) | |
| parent | de02d72bb3cc5b3d4c873db4ca8291723dd48479 (diff) | |
| download | linux-9fc282baa8f743a7049e301d13cf9968ee95a91c.tar.gz linux-9fc282baa8f743a7049e301d13cf9968ee95a91c.tar.bz2 linux-9fc282baa8f743a7049e301d13cf9968ee95a91c.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
net: Fix FDDI and TR config checks in ipv4 arp and LLC.
IPv4: unresolved multicast route cleanup
mac80211: remove association work when processing deauth request
ar9170: wait for asynchronous firmware loading
ipv4: udp: fix short packet and bad checksum logging
phy: Fix initialization in micrel driver.
sctp: Fix a race between ICMP protocol unreachable and connect()
veth: Dont kfree_skb() after dev_forward_skb()
IPv6: fix IPV6_RECVERR handling of locally-generated errors
net/gianfar: drop recycled skbs on MTU change
iwlwifi: work around passive scan issue
Diffstat (limited to 'drivers/net/phy')
| -rw-r--r-- | drivers/net/phy/micrel.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c index 0cd80e4d71d9..e67691dca4ab 100644 --- a/drivers/net/phy/micrel.c +++ b/drivers/net/phy/micrel.c @@ -32,6 +32,7 @@ static int kszphy_config_init(struct phy_device *phydev) static struct phy_driver ks8001_driver = { .phy_id = PHY_ID_KS8001, + .name = "Micrel KS8001", .phy_id_mask = 0x00fffff0, .features = PHY_BASIC_FEATURES, .flags = PHY_POLL, |