From 7fbd3c7a76f0dc82af057f78843d4ec416cab274 Mon Sep 17 00:00:00 2001
From: Francois Romieu <romieu@fr.zoreil.com>
Date: Sat, 3 Sep 2005 00:57:51 +0200
Subject: [PATCH] --- yaml --- r: 7274 b: refs/heads/master c:
 e797637f4c1cbcecb2d8f5cfa05b161da1f0b802 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/net/Kconfig  | 7 +++++--
 trunk/drivers/net/sis190.c | 6 +++---
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 76bf1a465c44..5eda92707804 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c3d6f1f24cf3fdfdad3bff631349dc2aef06c8df
+refs/heads/master: e797637f4c1cbcecb2d8f5cfa05b161da1f0b802
diff --git a/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig
index 7d8bcb38797a..7a56556c9712 100644
--- a/trunk/drivers/net/Kconfig
+++ b/trunk/drivers/net/Kconfig
@@ -1924,12 +1924,15 @@ config R8169_VLAN
 	  If in doubt, say Y.
 
 config SIS190
-	tristate "SiS190 gigabit ethernet support"
+	tristate "SiS190/SiS191 gigabit ethernet support"
 	depends on PCI
 	select CRC32
 	select MII
 	---help---
-	  Say Y here if you have a SiS 190 PCI Gigabit Ethernet adapter.
+	  Say Y here if you have a SiS 190 PCI Fast Ethernet adapter or
+	  a SiS 191 PCI Gigabit Ethernet adapter. Both are expected to
+	  appear in lan on motherboard designs which are based on SiS 965
+	  and SiS 966 south bridge.
 
 	  To compile this driver as a module, choose M here: the module
 	  will be called sis190.  This is recommended.
diff --git a/trunk/drivers/net/sis190.c b/trunk/drivers/net/sis190.c
index 61a24a944b87..92f75529eff8 100644
--- a/trunk/drivers/net/sis190.c
+++ b/trunk/drivers/net/sis190.c
@@ -331,14 +331,14 @@ static struct mii_chip_info {
 
 const static struct {
 	const char *name;
-	u8 version;		/* depend on docs */
-	u32 RxConfigMask;	/* clear the bits supported by this chip */
 } sis_chip_info[] = {
-	{ DRV_NAME, 0x00, 0xff7e1880, },
+	{ "SiS 190 PCI Fast Ethernet adapter" },
+	{ "SiS 191 PCI Gigabit Ethernet adapter" },
 };
 
 static struct pci_device_id sis190_pci_tbl[] __devinitdata = {
 	{ PCI_DEVICE(PCI_VENDOR_ID_SI, 0x0190), 0, 0, 0 },
+	{ PCI_DEVICE(PCI_VENDOR_ID_SI, 0x0191), 0, 0, 1 },
 	{ 0, },
 };