summaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/ftdi_sio.c
diff options
context:
space:
mode:
authorMitchell Solomon2010-02-12 19:23:18 +0100
committerGreg Kroah-Hartman2010-03-02 23:54:53 +0100
commit9714080d20f2ec4b671a06ce69367d91fa9e227e (patch)
treecc237e47087cf9a9bfcab8a6872abd1caa9ad5e0 /drivers/usb/serial/ftdi_sio.c
parentUSB: ftdi_sio: Replace BKL with a mutex (diff)
downloadkernel-qcow2-linux-9714080d20f2ec4b671a06ce69367d91fa9e227e.tar.gz
kernel-qcow2-linux-9714080d20f2ec4b671a06ce69367d91fa9e227e.tar.xz
kernel-qcow2-linux-9714080d20f2ec4b671a06ce69367d91fa9e227e.zip
USB: add new ftdi_sio device ids
PID patch for my products Signed-off-by: Mitchell Solomon <mitchjs@rush2112.net> Cc: stable <stable@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/serial/ftdi_sio.c')
-rw-r--r--drivers/usb/serial/ftdi_sio.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 82612997f92c..d59262ecc229 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -738,6 +738,10 @@ static struct usb_device_id id_table_combined [] = {
.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
{ USB_DEVICE(FTDI_VID, HAMEG_HO820_PID) },
{ USB_DEVICE(FTDI_VID, HAMEG_HO870_PID) },
+ { USB_DEVICE(FTDI_VID, MJSG_GENERIC_PID) },
+ { USB_DEVICE(FTDI_VID, MJSG_SR_RADIO_PID) },
+ { USB_DEVICE(FTDI_VID, MJSG_HD_RADIO_PID) },
+ { USB_DEVICE(FTDI_VID, MJSG_XM_RADIO_PID) },
{ }, /* Optional parameter entry */
{ } /* Terminating entry */
};