From 9adf2d5ab85894cba0c7979afbdbeb348ce6a3e8 Mon Sep 17 00:00:00 2001
From: Nathan Bronson <ndb@sns-usa.com>
Date: Mon, 10 Apr 2006 00:05:09 -0400
Subject: [PATCH] --- yaml --- r: 26253 b: refs/heads/master c:
 cdd3b1565a8d563ed84cf1c2af6cabf461f3c317 h: refs/heads/master i:   26251:
 bd6e2fe8f276c46d980477fc992ac752311dc9eb v: v3

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

diff --git a/[refs] b/[refs]
index a2eccb2c626d..3e725170c5ce 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c67808eee61a01c3128298c5972426a1a67b9093
+refs/heads/master: cdd3b1565a8d563ed84cf1c2af6cabf461f3c317
diff --git a/trunk/drivers/usb/serial/ftdi_sio.c b/trunk/drivers/usb/serial/ftdi_sio.c
index f5851db67f5b..5eb646ee0979 100644
--- a/trunk/drivers/usb/serial/ftdi_sio.c
+++ b/trunk/drivers/usb/serial/ftdi_sio.c
@@ -493,6 +493,7 @@ static struct usb_device_id id_table_combined [] = {
 	{ USB_DEVICE(FTDI_VID, FTDI_WESTREX_MODEL_777_PID) },
 	{ 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(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
index 2155f0e4a378..b6c50a16ef80 100644
--- a/trunk/drivers/usb/serial/ftdi_sio.h
+++ b/trunk/drivers/usb/serial/ftdi_sio.h
@@ -399,6 +399,11 @@
 #define FTDI_WESTREX_MODEL_777_PID	0xDC00	/* Model 777 */
 #define FTDI_WESTREX_MODEL_8900F_PID	0xDC01	/* Model 8900F */
 
+/*
+ * RR-CirKits LocoBuffer USB (http://www.rr-cirkits.com)
+ */
+#define FTDI_RRCIRKITS_LOCOBUFFER_PID	0xc7d0	/* LocoBuffer USB */
+
 /*
  * Eclo (http://www.eclo.pt/) product IDs.
  * PID 0xEA90 submitted by Martin Grill.