From a0d53d681a4e288bf35600c454373e7dc8b61a87 Mon Sep 17 00:00:00 2001
From: Flavio Leitner <fbl@redhat.com>
Date: Fri, 21 Sep 2012 21:04:34 -0300
Subject: [PATCH] --- yaml --- r: 325781 b: refs/heads/master c:
 26e8220adb0aec43b7acafa0f1431760eee28522 h: refs/heads/master i:   325779:
 73b0ac1e94c84a781130f5014ef60e6aee4462f7 v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/tty/serial/8250/8250_pci.c | 9 +++++++--
 trunk/include/linux/pci_ids.h            | 1 -
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 4b9c2be5a549..ba6c9cd308f7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a12fcf8b1543c99ffcec3d61db86f0dea52dc9d
+refs/heads/master: 26e8220adb0aec43b7acafa0f1431760eee28522
diff --git a/trunk/drivers/tty/serial/8250/8250_pci.c b/trunk/drivers/tty/serial/8250/8250_pci.c
index fdab80a4e063..cd5f2575fd47 100644
--- a/trunk/drivers/tty/serial/8250/8250_pci.c
+++ b/trunk/drivers/tty/serial/8250/8250_pci.c
@@ -1181,6 +1181,8 @@ pci_wch_ch353_setup(struct serial_private *priv,
 #define PCI_SUBDEVICE_ID_OCTPRO422	0x0208
 #define PCI_SUBDEVICE_ID_POCTAL232	0x0308
 #define PCI_SUBDEVICE_ID_POCTAL422	0x0408
+#define PCI_SUBDEVICE_ID_SIIG_DUAL_00	0x2500
+#define PCI_SUBDEVICE_ID_SIIG_DUAL_30	0x2530
 #define PCI_VENDOR_ID_ADVANTECH		0x13fe
 #define PCI_DEVICE_ID_INTEL_CE4100_UART 0x2e66
 #define PCI_DEVICE_ID_ADVANTECH_PCI3620	0x3620
@@ -3286,8 +3288,11 @@ static struct pci_device_id serial_pci_tbl[] = {
 		 * For now just used the hex ID 0x950a.
 		 */
 	{	PCI_VENDOR_ID_OXSEMI, 0x950a,
-		PCI_SUBVENDOR_ID_SIIG, PCI_SUBDEVICE_ID_SIIG_DUAL_SERIAL, 0, 0,
-		pbn_b0_2_115200 },
+		PCI_SUBVENDOR_ID_SIIG, PCI_SUBDEVICE_ID_SIIG_DUAL_00,
+		0, 0, pbn_b0_2_115200 },
+	{	PCI_VENDOR_ID_OXSEMI, 0x950a,
+		PCI_SUBVENDOR_ID_SIIG, PCI_SUBDEVICE_ID_SIIG_DUAL_30,
+		0, 0, pbn_b0_2_115200 },
 	{	PCI_VENDOR_ID_OXSEMI, 0x950a,
 		PCI_ANY_ID, PCI_ANY_ID, 0, 0,
 		pbn_b0_2_1130000 },
diff --git a/trunk/include/linux/pci_ids.h b/trunk/include/linux/pci_ids.h
index 6b4565c440c8..8d3c42719387 100644
--- a/trunk/include/linux/pci_ids.h
+++ b/trunk/include/linux/pci_ids.h
@@ -1847,7 +1847,6 @@
 #define PCI_DEVICE_ID_SIIG_8S_20x_650	0x2081
 #define PCI_DEVICE_ID_SIIG_8S_20x_850	0x2082
 #define PCI_SUBDEVICE_ID_SIIG_QUARTET_SERIAL	0x2050
-#define PCI_SUBDEVICE_ID_SIIG_DUAL_SERIAL	0x2530
 
 #define PCI_VENDOR_ID_RADISYS		0x1331