diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-05-20 00:03:38 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-05-20 00:03:38 -0400 |
| commit | badc48e6605ddeeb2484afae5993c859494decaa (patch) | |
| tree | 7da638f9bb53b1812b71e40ad6deca91d59ad301 /drivers/net/sis900.c | |
| parent | 753a6c4ff4c371a3e4e3408aaba4d03f3cfde73a (diff) | |
| parent | 2f880b65fdbc2d4915bddc59d75a176329570fdd (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/net/sis900.c')
| -rw-r--r-- | drivers/net/sis900.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/sis900.c b/drivers/net/sis900.c index 3b3e1046d0a4..d05874172209 100644 --- a/drivers/net/sis900.c +++ b/drivers/net/sis900.c | |||
| @@ -128,6 +128,7 @@ static const struct mii_chip_info { | |||
| 128 | } mii_chip_table[] = { | 128 | } mii_chip_table[] = { |
| 129 | { "SiS 900 Internal MII PHY", 0x001d, 0x8000, LAN }, | 129 | { "SiS 900 Internal MII PHY", 0x001d, 0x8000, LAN }, |
| 130 | { "SiS 7014 Physical Layer Solution", 0x0016, 0xf830, LAN }, | 130 | { "SiS 7014 Physical Layer Solution", 0x0016, 0xf830, LAN }, |
| 131 | { "SiS 900 on Foxconn 661 7MI", 0x0143, 0xBC70, LAN }, | ||
| 131 | { "Altimata AC101LF PHY", 0x0022, 0x5520, LAN }, | 132 | { "Altimata AC101LF PHY", 0x0022, 0x5520, LAN }, |
| 132 | { "ADM 7001 LAN PHY", 0x002e, 0xcc60, LAN }, | 133 | { "ADM 7001 LAN PHY", 0x002e, 0xcc60, LAN }, |
| 133 | { "AMD 79C901 10BASE-T PHY", 0x0000, 0x6B70, LAN }, | 134 | { "AMD 79C901 10BASE-T PHY", 0x0000, 0x6B70, LAN }, |