From bff460cbab7ae6365acd39102847adb708924f76 Mon Sep 17 00:00:00 2001
From: Martin Michlmayr <tbm@cyrius.com>
Date: Tue, 10 Aug 2010 20:31:21 +0100
Subject: [PATCH] --- yaml --- r: 209893 b: refs/heads/master c:
 666cc076d284e32d11bfc5ea2fbfc50434cff051 h: refs/heads/master i:   209891:
 eff71d3dc039e43637be811041884ac64d57b655 v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/usb/serial/ftdi_sio.c     | 2 ++
 trunk/drivers/usb/serial/ftdi_sio_ids.h | 6 ++++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9da9a0fe3772..e8e1619bc0aa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fd6e5bbb241720715cee737f534496d7c0ae9022
+refs/heads/master: 666cc076d284e32d11bfc5ea2fbfc50434cff051
diff --git a/trunk/drivers/usb/serial/ftdi_sio.c b/trunk/drivers/usb/serial/ftdi_sio.c
index e04a41613fbf..aeb93316791a 100644
--- a/trunk/drivers/usb/serial/ftdi_sio.c
+++ b/trunk/drivers/usb/serial/ftdi_sio.c
@@ -750,6 +750,8 @@ static struct usb_device_id id_table_combined [] = {
 	{ USB_DEVICE(FTDI_VID, XVERVE_SIGNALYZER_SH4_PID),
 		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
 	{ USB_DEVICE(FTDI_VID, SEGWAY_RMP200_PID) },
+	{ USB_DEVICE(IONICS_VID, IONICS_PLUGCOMPUTER_PID),
+		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
 	{ },					/* Optional parameter entry */
 	{ }					/* Terminating entry */
 };
diff --git a/trunk/drivers/usb/serial/ftdi_sio_ids.h b/trunk/drivers/usb/serial/ftdi_sio_ids.h
index 6e612c52e763..aa37cc511282 100644
--- a/trunk/drivers/usb/serial/ftdi_sio_ids.h
+++ b/trunk/drivers/usb/serial/ftdi_sio_ids.h
@@ -988,6 +988,12 @@
 #define ALTI2_VID	0x1BC9
 #define ALTI2_N3_PID	0x6001	/* Neptune 3 */
 
+/*
+ * Ionics PlugComputer
+ */
+#define IONICS_VID			0x1c0c
+#define IONICS_PLUGCOMPUTER_PID		0x0102
+
 /*
  * Dresden Elektronik Sensor Terminal Board
  */