diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
| commit | 1ebbe2b20091d306453a5cf480a87e6cd28ae76f (patch) | |
| tree | f5cd7a0fa69b8b1938cb5a0faed2e7b0628072a5 /drivers/net/sis900.c | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
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 a1cb07cdb60f..253440a98022 100644 --- a/drivers/net/sis900.c +++ b/drivers/net/sis900.c | |||
| @@ -128,6 +128,7 @@ static const struct mii_chip_info { | |||
| 128 | { "SiS 900 Internal MII PHY", 0x001d, 0x8000, LAN }, | 128 | { "SiS 900 Internal MII PHY", 0x001d, 0x8000, LAN }, |
| 129 | { "SiS 7014 Physical Layer Solution", 0x0016, 0xf830, LAN }, | 129 | { "SiS 7014 Physical Layer Solution", 0x0016, 0xf830, LAN }, |
| 130 | { "Altimata AC101LF PHY", 0x0022, 0x5520, LAN }, | 130 | { "Altimata AC101LF PHY", 0x0022, 0x5520, LAN }, |
| 131 | { "ADM 7001 LAN PHY", 0x002e, 0xcc60, LAN }, | ||
| 131 | { "AMD 79C901 10BASE-T PHY", 0x0000, 0x6B70, LAN }, | 132 | { "AMD 79C901 10BASE-T PHY", 0x0000, 0x6B70, LAN }, |
| 132 | { "AMD 79C901 HomePNA PHY", 0x0000, 0x6B90, HOME}, | 133 | { "AMD 79C901 HomePNA PHY", 0x0000, 0x6B90, HOME}, |
| 133 | { "ICS LAN PHY", 0x0015, 0xF440, LAN }, | 134 | { "ICS LAN PHY", 0x0015, 0xF440, LAN }, |