The patch titled
serial: Add PCMCIA IDs for Quatech DSP-100 dual RS232 adapter
has been removed from the -mm tree. Its filename was
serial-add-pcmcia-ids-for-quatech-dsp-100-dual-rs232.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: serial: Add PCMCIA IDs for Quatech DSP-100 dual RS232 adapter
From: Sergei Organov <osv@xxxxxxxxx>
Add PCMCIA IDs for Quatech DSP-100 dual RS232 adapter.
Signed-off-by: Sergei Organov <osv@xxxxxxxxx>
Acked-by: Alan Cox <alan@xxxxxxxxxx>
Cc: Russell King <rmk@xxxxxxxxxxxxxxxx>
Cc: Dominik Brodowski <linux@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/serial/serial_cs.c | 5 +++++
include/pcmcia/ciscode.h | 1 +
2 files changed, 6 insertions(+)
diff -puN drivers/serial/serial_cs.c~serial-add-pcmcia-ids-for-quatech-dsp-100-dual-rs232 drivers/serial/serial_cs.c
--- a/drivers/serial/serial_cs.c~serial-add-pcmcia-ids-for-quatech-dsp-100-dual-rs232
+++ a/drivers/serial/serial_cs.c
@@ -249,6 +249,10 @@ static const struct serial_quirk quirks[
.multi = 2,
}, {
.manfid = MANFID_QUATECH,
+ .prodid = PRODID_QUATECH_DUAL_RS232_G,
+ .multi = 2,
+ }, {
+ .manfid = MANFID_QUATECH,
.prodid = PRODID_QUATECH_QUAD_RS232,
.multi = 4,
}, {
@@ -893,6 +897,7 @@ static struct pcmcia_device_id serial_id
PCMCIA_DEVICE_PROD_ID12("OEM ", "C288MX ", 0xb572d360, 0xd2385b7a),
PCMCIA_DEVICE_PROD_ID12("PCMCIA ", "C336MX ", 0x99bcafe9, 0xaa25bcab),
PCMCIA_DEVICE_PROD_ID12("Quatech Inc", "PCMCIA Dual RS-232 Serial Port Card", 0xc4420b35, 0x92abc92f),
+ PCMCIA_DEVICE_PROD_ID12("Quatech Inc", "Dual RS-232 Serial Port PC Card", 0xc4420b35, 0x031a380d),
PCMCIA_PFC_DEVICE_CIS_PROD_ID12(1, "PCMCIA", "EN2218-LAN/MODEM", 0x281f1c5d, 0x570f348e, "PCMLM28.cis"),
PCMCIA_PFC_DEVICE_CIS_PROD_ID12(1, "PCMCIA", "UE2218-LAN/MODEM", 0x281f1c5d, 0x6fdcacee, "PCMLM28.cis"),
PCMCIA_PFC_DEVICE_CIS_PROD_ID12(1, "Psion Dacom", "Gold Card V34 Ethernet", 0xf5f025c2, 0x338e8155, "PCMLM28.cis"),
diff -puN include/pcmcia/ciscode.h~serial-add-pcmcia-ids-for-quatech-dsp-100-dual-rs232 include/pcmcia/ciscode.h
--- a/include/pcmcia/ciscode.h~serial-add-pcmcia-ids-for-quatech-dsp-100-dual-rs232
+++ a/include/pcmcia/ciscode.h
@@ -95,6 +95,7 @@
#define PRODID_QUATECH_DUAL_RS232 0x0012
#define PRODID_QUATECH_DUAL_RS232_D1 0x0007
#define PRODID_QUATECH_DUAL_RS232_D2 0x0052
+#define PRODID_QUATECH_DUAL_RS232_G 0x004d
#define PRODID_QUATECH_QUAD_RS232 0x001b
#define PRODID_QUATECH_DUAL_RS422 0x000e
#define PRODID_QUATECH_QUAD_RS422 0x0045
_
Patches currently in -mm which might be from osv@xxxxxxxxx are
char-mxser_new-alter-locking-in-isr.patch
char-mxser_new-fix-twice-resource-releasing.patch
char-mxser_new-do-not-null-driver_data.patch
char-mxser_new-lock-count-and-flags.patch
char-mxser_new-fix-sparse-warning.patch
-
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
