diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/Kconfig | 7 | ||||
-rw-r--r-- | drivers/net/sis190.c | 6 |
2 files changed, 8 insertions, 5 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 7d8bcb38797a..7a56556c9712 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
@@ -1924,12 +1924,15 @@ config R8169_VLAN | |||
1924 | If in doubt, say Y. | 1924 | If in doubt, say Y. |
1925 | 1925 | ||
1926 | config SIS190 | 1926 | config SIS190 |
1927 | tristate "SiS190 gigabit ethernet support" | 1927 | tristate "SiS190/SiS191 gigabit ethernet support" |
1928 | depends on PCI | 1928 | depends on PCI |
1929 | select CRC32 | 1929 | select CRC32 |
1930 | select MII | 1930 | select MII |
1931 | ---help--- | 1931 | ---help--- |
1932 | Say Y here if you have a SiS 190 PCI Gigabit Ethernet adapter. | 1932 | Say Y here if you have a SiS 190 PCI Fast Ethernet adapter or |
1933 | a SiS 191 PCI Gigabit Ethernet adapter. Both are expected to | ||
1934 | appear in lan on motherboard designs which are based on SiS 965 | ||
1935 | and SiS 966 south bridge. | ||
1933 | 1936 | ||
1934 | To compile this driver as a module, choose M here: the module | 1937 | To compile this driver as a module, choose M here: the module |
1935 | will be called sis190. This is recommended. | 1938 | will be called sis190. This is recommended. |
diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c index 61a24a944b87..92f75529eff8 100644 --- a/drivers/net/sis190.c +++ b/drivers/net/sis190.c | |||
@@ -331,14 +331,14 @@ static struct mii_chip_info { | |||
331 | 331 | ||
332 | const static struct { | 332 | const static struct { |
333 | const char *name; | 333 | const char *name; |
334 | u8 version; /* depend on docs */ | ||
335 | u32 RxConfigMask; /* clear the bits supported by this chip */ | ||
336 | } sis_chip_info[] = { | 334 | } sis_chip_info[] = { |
337 | { DRV_NAME, 0x00, 0xff7e1880, }, | 335 | { "SiS 190 PCI Fast Ethernet adapter" }, |
336 | { "SiS 191 PCI Gigabit Ethernet adapter" }, | ||
338 | }; | 337 | }; |
339 | 338 | ||
340 | static struct pci_device_id sis190_pci_tbl[] __devinitdata = { | 339 | static struct pci_device_id sis190_pci_tbl[] __devinitdata = { |
341 | { PCI_DEVICE(PCI_VENDOR_ID_SI, 0x0190), 0, 0, 0 }, | 340 | { PCI_DEVICE(PCI_VENDOR_ID_SI, 0x0190), 0, 0, 0 }, |
341 | { PCI_DEVICE(PCI_VENDOR_ID_SI, 0x0191), 0, 0, 1 }, | ||
342 | { 0, }, | 342 | { 0, }, |
343 | }; | 343 | }; |
344 | 344 | ||