diff options
-rw-r--r-- | drivers/media/dvb/dvb-usb/af9015.c | 6 | ||||
-rw-r--r-- | drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/drivers/media/dvb/dvb-usb/af9015.c b/drivers/media/dvb/dvb-usb/af9015.c index 580ed14e5543..3ef19a83418c 100644 --- a/drivers/media/dvb/dvb-usb/af9015.c +++ b/drivers/media/dvb/dvb-usb/af9015.c | |||
@@ -754,6 +754,8 @@ static const struct af9015_rc_setup af9015_rc_setup_usbids[] = { | |||
754 | RC_MAP_TREKSTOR }, | 754 | RC_MAP_TREKSTOR }, |
755 | { (USB_VID_KWORLD_2 << 16) + USB_PID_TINYTWIN_2, | 755 | { (USB_VID_KWORLD_2 << 16) + USB_PID_TINYTWIN_2, |
756 | RC_MAP_DIGITALNOW_TINYTWIN }, | 756 | RC_MAP_DIGITALNOW_TINYTWIN }, |
757 | { (USB_VID_GTEK << 16) + USB_PID_TINYTWIN_3, | ||
758 | RC_MAP_DIGITALNOW_TINYTWIN }, | ||
757 | { } | 759 | { } |
758 | }; | 760 | }; |
759 | 761 | ||
@@ -1285,6 +1287,7 @@ static struct usb_device_id af9015_usb_table[] = { | |||
1285 | {USB_DEVICE(USB_VID_TERRATEC, | 1287 | {USB_DEVICE(USB_VID_TERRATEC, |
1286 | USB_PID_TERRATEC_CINERGY_T_STICK_DUAL_RC)}, | 1288 | USB_PID_TERRATEC_CINERGY_T_STICK_DUAL_RC)}, |
1287 | /* 35 */{USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_A850T)}, | 1289 | /* 35 */{USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_A850T)}, |
1290 | {USB_DEVICE(USB_VID_GTEK, USB_PID_TINYTWIN_3)}, | ||
1288 | {0}, | 1291 | {0}, |
1289 | }; | 1292 | }; |
1290 | MODULE_DEVICE_TABLE(usb, af9015_usb_table); | 1293 | MODULE_DEVICE_TABLE(usb, af9015_usb_table); |
@@ -1380,7 +1383,8 @@ static struct dvb_usb_device_properties af9015_properties[] = { | |||
1380 | { | 1383 | { |
1381 | .name = "DigitalNow TinyTwin DVB-T Receiver", | 1384 | .name = "DigitalNow TinyTwin DVB-T Receiver", |
1382 | .cold_ids = {&af9015_usb_table[5], | 1385 | .cold_ids = {&af9015_usb_table[5], |
1383 | &af9015_usb_table[28], NULL}, | 1386 | &af9015_usb_table[28], |
1387 | &af9015_usb_table[36], NULL}, | ||
1384 | .warm_ids = {NULL}, | 1388 | .warm_ids = {NULL}, |
1385 | }, | 1389 | }, |
1386 | { | 1390 | { |
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h index cea77673c94b..192a40ce583d 100644 --- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h +++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h | |||
@@ -32,6 +32,7 @@ | |||
32 | #define USB_VID_EMPIA 0xeb1a | 32 | #define USB_VID_EMPIA 0xeb1a |
33 | #define USB_VID_GENPIX 0x09c0 | 33 | #define USB_VID_GENPIX 0x09c0 |
34 | #define USB_VID_GRANDTEC 0x5032 | 34 | #define USB_VID_GRANDTEC 0x5032 |
35 | #define USB_VID_GTEK 0x1f4d | ||
35 | #define USB_VID_HANFTEK 0x15f4 | 36 | #define USB_VID_HANFTEK 0x15f4 |
36 | #define USB_VID_HAUPPAUGE 0x2040 | 37 | #define USB_VID_HAUPPAUGE 0x2040 |
37 | #define USB_VID_HYPER_PALTEK 0x1025 | 38 | #define USB_VID_HYPER_PALTEK 0x1025 |
@@ -145,6 +146,7 @@ | |||
145 | #define USB_PID_TWINHAN_VP7021_WARM 0x3208 | 146 | #define USB_PID_TWINHAN_VP7021_WARM 0x3208 |
146 | #define USB_PID_TINYTWIN 0x3226 | 147 | #define USB_PID_TINYTWIN 0x3226 |
147 | #define USB_PID_TINYTWIN_2 0xe402 | 148 | #define USB_PID_TINYTWIN_2 0xe402 |
149 | #define USB_PID_TINYTWIN_3 0x9016 | ||
148 | #define USB_PID_DNTV_TINYUSB2_COLD 0x3223 | 150 | #define USB_PID_DNTV_TINYUSB2_COLD 0x3223 |
149 | #define USB_PID_DNTV_TINYUSB2_WARM 0x3224 | 151 | #define USB_PID_DNTV_TINYUSB2_WARM 0x3224 |
150 | #define USB_PID_ULTIMA_TVBOX_COLD 0x8105 | 152 | #define USB_PID_ULTIMA_TVBOX_COLD 0x8105 |