summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgnacio García Pérez <iggarpe@t2i.com>2008-05-23 22:04:28 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2008-05-24 18:56:09 +0200
commit4b6f6ce97ecc20eb8f3ece3c8370faacfe73e8c2 (patch)
tree953c23a0fc718574b2ffa81979b5bb29ea77fb1c
parentfix parenthesis in include/asm-mips/mach-au1x00/au1000.h (diff)
downloadlinux-4b6f6ce97ecc20eb8f3ece3c8370faacfe73e8c2.tar.xz
linux-4b6f6ce97ecc20eb8f3ece3c8370faacfe73e8c2.zip
serial: support for InstaShield IS-400 four port RS-232 PCI card
Add support for the InstaShield IS-400 four port RS-232 PCI card. Signed-off-by: Ignacio García Pérez <iggarpe@t2i.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/serial/8250_pci.c7
-rw-r--r--include/linux/pci_ids.h1
2 files changed, 7 insertions, 1 deletions
diff --git a/drivers/serial/8250_pci.c b/drivers/serial/8250_pci.c
index 53fa19cf2f06..788c3559522d 100644
--- a/drivers/serial/8250_pci.c
+++ b/drivers/serial/8250_pci.c
@@ -2602,7 +2602,12 @@ static struct pci_device_id serial_pci_tbl[] = {
{ PCI_VENDOR_ID_INTASHIELD, PCI_DEVICE_ID_INTASHIELD_IS200,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, /* 135a.0811 */
pbn_b2_2_115200 },
-
+ /*
+ * IntaShield IS-400
+ */
+ { PCI_VENDOR_ID_INTASHIELD, PCI_DEVICE_ID_INTASHIELD_IS400,
+ PCI_ANY_ID, PCI_ANY_ID, 0, 0, /* 135a.0dc0 */
+ pbn_b2_4_115200 },
/*
* Perle PCI-RAS cards
*/
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 342b55afb0c3..9b940e644179 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1761,6 +1761,7 @@
#define PCI_VENDOR_ID_INTASHIELD 0x135a
#define PCI_DEVICE_ID_INTASHIELD_IS200 0x0d80
+#define PCI_DEVICE_ID_INTASHIELD_IS400 0x0dc0
#define PCI_VENDOR_ID_QUATECH 0x135C
#define PCI_DEVICE_ID_QUATECH_QSC100 0x0010