---

yaml --- r: 26255 b: refs/heads/master c: 7e0258f h: refs/heads/master i: 26253: 9adf2d5 26251: bd6e2fe 26247: ac8509b 26239: 5489bd0 v: v3
git-mirror · Apr 27, 2006 · 4516dc3 · 4516dc3
1 parent b63a9f6
commit 4516dc3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 69737dfaacd000b10fc4a1e9eb518b630b43c3ad
+refs/heads/master: 7e0258fd28762c09b997edb56849ecfa29284b79
diff --git a/trunk/drivers/usb/serial/ftdi_sio.c b/trunk/drivers/usb/serial/ftdi_sio.c
@@ -495,6 +495,7 @@ static struct usb_device_id id_table_combined [] = {
 	{ USB_DEVICE(FTDI_VID, FTDI_WESTREX_MODEL_8900F_PID) },
 	{ USB_DEVICE(FTDI_VID, FTDI_PCDJ_DAC2_PID) },
 	{ USB_DEVICE(FTDI_VID, FTDI_RRCIRKITS_LOCOBUFFER_PID) },
+	{ USB_DEVICE(FTDI_VID, FTDI_ASK_RDR400_PID) },
 	{ USB_DEVICE(ICOM_ID1_VID, ICOM_ID1_PID) },
 	{ USB_DEVICE(PAPOUCH_VID, PAPOUCH_TMU_PID) },
 	{ },					/* Optional parameter entry */

diff --git a/trunk/drivers/usb/serial/ftdi_sio.h b/trunk/drivers/usb/serial/ftdi_sio.h
@@ -155,6 +155,11 @@
 #define ICOM_ID1_VID            0x0C26
 #define ICOM_ID1_PID            0x0004
 
+/*
+ * ASK.fr devices
+ */
+#define FTDI_ASK_RDR400_PID	0xC991	/* ASK RDR 400 series card reader */
+
 /*
  * DSS-20 Sync Station for Sony Ericsson P800
  */