| From b12807a121169cc706ac5b00894b6d26ae876f37 Mon Sep 17 00:00:00 2001 |
| From: Michael Williamson <michael.h.williamson@gmail.com> |
| Date: Thu, 27 Jan 2011 18:36:19 -0600 |
| Subject: [PATCH] USB: ftdi_sio: Add VID=0x0647, PID=0x0100 for Acton Research |
| spectrograph |
| |
| commit 28fe2eb0162a1d23370dd99ff7d0e35632b1ee91 upstream. |
| |
| Add the USB Vendor ID and Product ID for a Acton Research Corp. |
| spectrograph device with a FTDI chip for serial I/O. |
| |
| Signed-off-by: Michael H Williamson <michael.h.williamson@gmail.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c |
| index f4b2527..05dcaa0 100644 |
| --- a/drivers/usb/serial/ftdi_sio.c |
| +++ b/drivers/usb/serial/ftdi_sio.c |
| @@ -625,6 +625,7 @@ static struct usb_device_id id_table_combined [] = { |
| { USB_DEVICE(FTDI_VID, FTDI_OCEANIC_PID) }, |
| { USB_DEVICE(TTI_VID, TTI_QL355P_PID) }, |
| { USB_DEVICE(FTDI_VID, FTDI_RM_CANVIEW_PID) }, |
| + { USB_DEVICE(ACTON_VID, ACTON_SPECTRAPRO_PID) }, |
| { USB_DEVICE(CONTEC_VID, CONTEC_COM1USBH_PID) }, |
| { USB_DEVICE(BANDB_VID, BANDB_USOTL4_PID) }, |
| { USB_DEVICE(BANDB_VID, BANDB_USTL4_PID) }, |
| diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h |
| index 5f3f5da..73d8c79 100644 |
| --- a/drivers/usb/serial/ftdi_sio_ids.h |
| +++ b/drivers/usb/serial/ftdi_sio_ids.h |
| @@ -518,6 +518,12 @@ |
| #define RATOC_PRODUCT_ID_USB60F 0xb020 |
| |
| /* |
| + * Acton Research Corp. |
| + */ |
| +#define ACTON_VID 0x0647 /* Vendor ID */ |
| +#define ACTON_SPECTRAPRO_PID 0x0100 |
| + |
| +/* |
| * Contec products (http://www.contec.com) |
| * Submitted by Daniel Sangorrin |
| */ |
| -- |
| 1.7.4.4 |
| |