- serial-support-for-instashield-is-400-four-port-rs-232-pci-card.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     serial: support for InstaShield IS-400 four port RS-232 PCI card
has been removed from the -mm tree.  Its filename was
     serial-support-for-instashield-is-400-four-port-rs-232-pci-card.patch

This patch was dropped because it was merged into mainline or a subsystem tree

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
Subject: serial: support for InstaShield IS-400 four port RS-232 PCI card
From: Ignacio García Pérez <iggarpe@xxxxxxx>

Add support for the InstaShield IS-400 four port RS-232 PCI card.

Signed-off-by: Ignacio García Pérez <iggarpe@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 drivers/serial/8250_pci.c |    7 ++++++-
 include/linux/pci_ids.h   |    1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff -puN drivers/serial/8250_pci.c~serial-support-for-instashield-is-400-four-port-rs-232-pci-card drivers/serial/8250_pci.c
--- a/drivers/serial/8250_pci.c~serial-support-for-instashield-is-400-four-port-rs-232-pci-card
+++ a/drivers/serial/8250_pci.c
@@ -2602,7 +2602,12 @@ static struct pci_device_id serial_pci_t
 	{	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 -puN include/linux/pci_ids.h~serial-support-for-instashield-is-400-four-port-rs-232-pci-card include/linux/pci_ids.h
--- a/include/linux/pci_ids.h~serial-support-for-instashield-is-400-four-port-rs-232-pci-card
+++ a/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
_

Patches currently in -mm which might be from iggarpe@xxxxxxx are


--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux