---

yaml --- r: 56831 b: refs/heads/master c: 762e92f h: refs/heads/master i: 56829: 8f5e5af 56827: 61cb510 56823: 72813ab 56815: ba65e20 56799: fcc502b 56767: 4e9a18d 56703: 55373ff 56575: 195f9a7 56319: 9c4eda5 v: v3
git-mirror · May 23, 2007 · d641ca0 · d641ca0
1 parent 364326f
commit d641ca0
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: bf87ce5a06ed2cb13ad04f065706cf36ab021549
+refs/heads/master: 762e92fa1742007dedd90ff6b1ea74842f0cd34b
diff --git 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
@@ -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 */