From d641ca083d62e25aba6c30065b1ec4ebcecc2ebb Mon Sep 17 00:00:00 2001
From: "Neil \\\"Superna\\\" ARMSTRONG" <superna@na-prod.com>
Date: Wed, 25 Apr 2007 20:34:28 +0200
Subject: [PATCH] --- yaml --- r: 56831 b: refs/heads/master c:
 762e92fa1742007dedd90ff6b1ea74842f0cd34b h: refs/heads/master i:   56829:
 8f5e5af87610ab7639168f8bae325c47b4c29126   56827:
 61cb510caf7977c6555e7576770e9b244a8aba90   56823:
 72813ab868a1f26c79e8e3850fa563b666c0bb1c   56815:
 ba65e20ecd59badfe8b99e126e134b10971edb2d   56799:
 fcc502bbe985f63218c664844d1d758b41657714   56767:
 4e9a18dc857aa154d21fef98fedd26277b0113f6   56703:
 55373ff118e4b2578a0f3dc8ea50e0eefbfa3be5   56575:
 195f9a7005f9395322cb18321c7e7cba40139742   56319:
 9c4eda52cc7e264d35542f2b5c0ad727e2be2c76 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 eeec2447e697..e7bab9195eb7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bf87ce5a06ed2cb13ad04f065706cf36ab021549
+refs/heads/master: 762e92fa1742007dedd90ff6b1ea74842f0cd34b
diff --git a/trunk/drivers/usb/serial/ftdi_sio.c b/trunk/drivers/usb/serial/ftdi_sio.c
index 95a1805b064f..9200edc8f0fd 100644
--- a/trunk/drivers/usb/serial/ftdi_sio.c
+++ b/trunk/drivers/usb/serial/ftdi_sio.c
@@ -525,6 +525,7 @@ static struct usb_device_id id_table_combined [] = {
 	{ USB_DEVICE(FTDI_VID, FTDI_TACTRIX_OPENPORT_13U_PID) },
 	{ USB_DEVICE(ELEKTOR_VID, ELEKTOR_FT323R_PID) },
 	{ USB_DEVICE(TELLDUS_VID, TELLDUS_TELLSTICK_PID) },
+	{ USB_DEVICE(FTDI_VID, FTDI_MAXSTREAM_PID) },
 	{ },					/* Optional parameter entry */
 	{ }					/* Terminating entry */
 };
diff --git a/trunk/drivers/usb/serial/ftdi_sio.h b/trunk/drivers/usb/serial/ftdi_sio.h
index 77ad0a09b384..c85c1fae0cb8 100644
--- a/trunk/drivers/usb/serial/ftdi_sio.h
+++ b/trunk/drivers/usb/serial/ftdi_sio.h
@@ -518,6 +518,11 @@
 #define FTDI_IBS_PEDO_PID	0xff3e  /* IBS PEDO-Modem (RF modem 868.35 MHz) */
 #define FTDI_IBS_PROD_PID	0xff3f  /* future device */
 
+/*
+ *  MaxStream devices	www.maxstream.net
+ */
+#define FTDI_MAXSTREAM_PID	0xEE18	/* Xbee PKG-U Module */
+
 /* Commands */
 #define FTDI_SIO_RESET 		0 /* Reset the port */
 #define FTDI_SIO_MODEM_CTRL 	1 /* Set the modem control register */