From e0238c0f49473e14074180636ac138f03bdd2974 Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Fri, 2 Jan 2009 13:46:58 +0000 Subject: [PATCH] --- yaml --- r: 125063 b: refs/heads/master c: 39aced68d664291db3324d0fcf0985ab5626aac2 h: refs/heads/master i: 125061: 13deb1a4586ccf9820fdc796f6ab2343be489c6e 125059: 94eebd55064243c807a080d2128f61d3db7b434b 125055: 776edea0fa6e1ddebdc2dafcf8a416fb8b7ad55c v: v3 --- [refs] | 2 +- trunk/drivers/serial/8250_pci.c | 3 +++ trunk/include/linux/pci_ids.h | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 9411884335cc..4c88679f59ae 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a6614999e800cf3a134ce93ea46ef837e3c0e76e +refs/heads/master: 39aced68d664291db3324d0fcf0985ab5626aac2 diff --git a/trunk/drivers/serial/8250_pci.c b/trunk/drivers/serial/8250_pci.c index 0b794138f686..2a2e1c717e8e 100644 --- a/trunk/drivers/serial/8250_pci.c +++ b/trunk/drivers/serial/8250_pci.c @@ -2387,6 +2387,9 @@ static struct pci_device_id serial_pci_tbl[] = { * www.ussg.iu.edu/hypermail/linux/kernel/0303.1/0516.html). * 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_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 b6e694454280..fa83dfefc5e0 100644 --- a/trunk/include/linux/pci_ids.h +++ b/trunk/include/linux/pci_ids.h @@ -1766,6 +1766,7 @@ #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