From c293acc2d103cea32fe6e5e71e139868601ff8cf Mon Sep 17 00:00:00 2001
From: Peter Naulls <peter@chocky.org>
Date: Tue, 17 Jan 2012 18:27:09 -0800
Subject: [PATCH] --- yaml --- r: 286999 b: refs/heads/master c:
 fc216ec363f4d174932df90bbf35c77d0540e561 h: refs/heads/master i:   286997:
 3dfba999bcd71f8fd8b91a90e090dbb22f71b9ae   286995:
 913073e3b9fda8b2b1e65b3d471a45acffce2a0b   286991:
 df83a83d4d5676474ace32d50a69743d9c3c4c77 v: v3

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

diff --git a/[refs] b/[refs]
index 322d2fa9c060..af8cde728fcd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 55f13aeae0346f0c89bfface91ad9a97653dc433
+refs/heads/master: fc216ec363f4d174932df90bbf35c77d0540e561
diff --git a/trunk/drivers/usb/serial/ftdi_sio.c b/trunk/drivers/usb/serial/ftdi_sio.c
index 5f42757930df..104aff536b1e 100644
--- a/trunk/drivers/usb/serial/ftdi_sio.c
+++ b/trunk/drivers/usb/serial/ftdi_sio.c
@@ -843,6 +843,7 @@ static struct usb_device_id id_table_combined [] = {
 		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
 	{ USB_DEVICE(ST_VID, ST_STMCLT1030_PID),
 		.driver_info = (kernel_ulong_t)&ftdi_stmclite_quirk },
+	{ USB_DEVICE(FTDI_VID, FTDI_RF_R106) },
 	{ },					/* 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 f35ddef72e04..09237ffe2f33 100644
--- a/trunk/drivers/usb/serial/ftdi_sio_ids.h
+++ b/trunk/drivers/usb/serial/ftdi_sio_ids.h
@@ -1175,3 +1175,9 @@
  */
 /* TagTracer MIFARE*/
 #define FTDI_ZEITCONTROL_TAGTRACE_MIFARE_PID	0xF7C0
+
+/*
+ * Rainforest Automation
+ */
+/* ZigBee controller */
+#define FTDI_RF_R106		0x8A28