aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial
diff options
context:
space:
mode:
authorFranco Lanza <nextime@nexlab.it>2007-12-25 21:29:33 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2008-02-01 17:34:45 -0500
commit34910434a2c5556c3b44f78c1c0347709b59a4da (patch)
treecb8b245330939e3630378c7406ccb4a430a480c9 /drivers/usb/serial
parent42f8aa945660b901a3c7f25447aa948bf03f208a (diff)
USB: ftdi-sio: Patch to add vendor/device id for ATK_16IC CCD
little patches only to add vendor/device id of ATK_16IC CCD cam for astronomy. From: Franco Lanza <nextime@nexlab.it> Cc: stable <stable@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/serial')
-rw-r--r--drivers/usb/serial/ftdi_sio.c1
-rw-r--r--drivers/usb/serial/ftdi_sio.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 0ea28b081c80..c06fa4837232 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -543,6 +543,7 @@ static struct usb_device_id id_table_combined [] = {
543 { USB_DEVICE(FTDI_VID, FTDI_ATIK_ATK16C_PID) }, 543 { USB_DEVICE(FTDI_VID, FTDI_ATIK_ATK16C_PID) },
544 { USB_DEVICE(FTDI_VID, FTDI_ATIK_ATK16HR_PID) }, 544 { USB_DEVICE(FTDI_VID, FTDI_ATIK_ATK16HR_PID) },
545 { USB_DEVICE(FTDI_VID, FTDI_ATIK_ATK16HRC_PID) }, 545 { USB_DEVICE(FTDI_VID, FTDI_ATIK_ATK16HRC_PID) },
546 { USB_DEVICE(FTDI_VID, FTDI_ATIK_ATK16IC_PID) },
546 { USB_DEVICE(KOBIL_VID, KOBIL_CONV_B1_PID) }, 547 { USB_DEVICE(KOBIL_VID, KOBIL_CONV_B1_PID) },
547 { USB_DEVICE(KOBIL_VID, KOBIL_CONV_KAAN_PID) }, 548 { USB_DEVICE(KOBIL_VID, KOBIL_CONV_KAAN_PID) },
548 { USB_DEVICE(POSIFLEX_VID, POSIFLEX_PP7000_PID) }, 549 { USB_DEVICE(POSIFLEX_VID, POSIFLEX_PP7000_PID) },
diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h
index a242bcf27157..abd632cdba9d 100644
--- a/drivers/usb/serial/ftdi_sio.h
+++ b/drivers/usb/serial/ftdi_sio.h
@@ -279,6 +279,7 @@
279#define FTDI_ATIK_ATK16C_PID 0xDF32 /* ATIK ATK-16C Colour Camera */ 279#define FTDI_ATIK_ATK16C_PID 0xDF32 /* ATIK ATK-16C Colour Camera */
280#define FTDI_ATIK_ATK16HR_PID 0xDF31 /* ATIK ATK-16HR Grayscale Camera */ 280#define FTDI_ATIK_ATK16HR_PID 0xDF31 /* ATIK ATK-16HR Grayscale Camera */
281#define FTDI_ATIK_ATK16HRC_PID 0xDF33 /* ATIK ATK-16HRC Colour Camera */ 281#define FTDI_ATIK_ATK16HRC_PID 0xDF33 /* ATIK ATK-16HRC Colour Camera */
282#define FTDI_ATIK_ATK16IC_PID 0xDF35 /* ATIK ATK-16IC Grayscale Camera */
282 283
283/* 284/*
284 * Protego product ids 285 * Protego product ids