diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/dvb-core/dvb-usb-ids.h | 1 | ||||
| -rw-r--r-- | drivers/media/usb/dvb-usb/ttusb2.c | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/drivers/media/dvb-core/dvb-usb-ids.h b/drivers/media/dvb-core/dvb-usb-ids.h index 7e1597dad568..399e1042d351 100644 --- a/drivers/media/dvb-core/dvb-usb-ids.h +++ b/drivers/media/dvb-core/dvb-usb-ids.h | |||
| @@ -242,6 +242,7 @@ | |||
| 242 | #define USB_PID_AVERMEDIA_A867 0xa867 | 242 | #define USB_PID_AVERMEDIA_A867 0xa867 |
| 243 | #define USB_PID_AVERMEDIA_TWINSTAR 0x0825 | 243 | #define USB_PID_AVERMEDIA_TWINSTAR 0x0825 |
| 244 | #define USB_PID_TECHNOTREND_CONNECT_S2400 0x3006 | 244 | #define USB_PID_TECHNOTREND_CONNECT_S2400 0x3006 |
| 245 | #define USB_PID_TECHNOTREND_CONNECT_S2400_8KEEPROM 0x3009 | ||
| 245 | #define USB_PID_TECHNOTREND_CONNECT_CT3650 0x300d | 246 | #define USB_PID_TECHNOTREND_CONNECT_CT3650 0x300d |
| 246 | #define USB_PID_TERRATEC_CINERGY_DT_XS_DIVERSITY 0x005a | 247 | #define USB_PID_TERRATEC_CINERGY_DT_XS_DIVERSITY 0x005a |
| 247 | #define USB_PID_TERRATEC_CINERGY_DT_XS_DIVERSITY_2 0x0081 | 248 | #define USB_PID_TERRATEC_CINERGY_DT_XS_DIVERSITY_2 0x0081 |
diff --git a/drivers/media/usb/dvb-usb/ttusb2.c b/drivers/media/usb/dvb-usb/ttusb2.c index bcdac225ebe1..2ce3d19c58ef 100644 --- a/drivers/media/usb/dvb-usb/ttusb2.c +++ b/drivers/media/usb/dvb-usb/ttusb2.c | |||
| @@ -620,6 +620,8 @@ static struct usb_device_id ttusb2_table [] = { | |||
| 620 | USB_PID_TECHNOTREND_CONNECT_S2400) }, | 620 | USB_PID_TECHNOTREND_CONNECT_S2400) }, |
| 621 | { USB_DEVICE(USB_VID_TECHNOTREND, | 621 | { USB_DEVICE(USB_VID_TECHNOTREND, |
| 622 | USB_PID_TECHNOTREND_CONNECT_CT3650) }, | 622 | USB_PID_TECHNOTREND_CONNECT_CT3650) }, |
| 623 | { USB_DEVICE(USB_VID_TECHNOTREND, | ||
| 624 | USB_PID_TECHNOTREND_CONNECT_S2400_8KEEPROM) }, | ||
| 623 | {} /* Terminating entry */ | 625 | {} /* Terminating entry */ |
| 624 | }; | 626 | }; |
| 625 | MODULE_DEVICE_TABLE (usb, ttusb2_table); | 627 | MODULE_DEVICE_TABLE (usb, ttusb2_table); |
| @@ -721,12 +723,16 @@ static struct dvb_usb_device_properties ttusb2_properties_s2400 = { | |||
| 721 | 723 | ||
| 722 | .generic_bulk_ctrl_endpoint = 0x01, | 724 | .generic_bulk_ctrl_endpoint = 0x01, |
| 723 | 725 | ||
| 724 | .num_device_descs = 1, | 726 | .num_device_descs = 2, |
| 725 | .devices = { | 727 | .devices = { |
| 726 | { "Technotrend TT-connect S-2400", | 728 | { "Technotrend TT-connect S-2400", |
| 727 | { &ttusb2_table[2], NULL }, | 729 | { &ttusb2_table[2], NULL }, |
| 728 | { NULL }, | 730 | { NULL }, |
| 729 | }, | 731 | }, |
| 732 | { "Technotrend TT-connect S-2400 (8kB EEPROM)", | ||
| 733 | { &ttusb2_table[4], NULL }, | ||
| 734 | { NULL }, | ||
| 735 | }, | ||
| 730 | } | 736 | } |
| 731 | }; | 737 | }; |
| 732 | 738 | ||
