From c6e103dec56907b3de6e1bed27a4f498a92115b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ignacio=20Garc=C3=ADa=20P=C3=A9rez?= <iggarpe@t2i.com>
Date: Fri, 23 May 2008 13:04:28 -0700
Subject: [PATCH] --- yaml --- r: 97246 b: refs/heads/master c:
 4b6f6ce97ecc20eb8f3ece3c8370faacfe73e8c2 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index df20bf0d3ba3..d5a50dc8fd5a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 25829b0e977a7e396b284dad0f523099394390e7
+refs/heads/master: 4b6f6ce97ecc20eb8f3ece3c8370faacfe73e8c2
diff --git a/trunk/drivers/serial/8250_pci.c b/trunk/drivers/serial/8250_pci.c
index 53fa19cf2f06..788c3559522d 100644
--- a/trunk/drivers/serial/8250_pci.c
+++ b/trunk/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/trunk/include/linux/pci_ids.h b/trunk/include/linux/pci_ids.h
index 342b55afb0c3..9b940e644179 100644
--- a/trunk/include/linux/pci_ids.h
+++ b/trunk/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