diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/media/dvb/dvb-usb/af9005.c | 7 | ||||
-rw-r--r-- | drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/drivers/media/dvb/dvb-usb/af9005.c b/drivers/media/dvb/dvb-usb/af9005.c index 7db6eee50e39..e7f76f515b4f 100644 --- a/drivers/media/dvb/dvb-usb/af9005.c +++ b/drivers/media/dvb/dvb-usb/af9005.c | |||
@@ -1026,6 +1026,7 @@ static int af9005_usb_probe(struct usb_interface *intf, | |||
1026 | static struct usb_device_id af9005_usb_table[] = { | 1026 | static struct usb_device_id af9005_usb_table[] = { |
1027 | {USB_DEVICE(USB_VID_AFATECH, USB_PID_AFATECH_AF9005)}, | 1027 | {USB_DEVICE(USB_VID_AFATECH, USB_PID_AFATECH_AF9005)}, |
1028 | {USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_T_USB_XE)}, | 1028 | {USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_T_USB_XE)}, |
1029 | {USB_DEVICE(USB_VID_ANSONIC, USB_PID_ANSONIC_DVBT_USB)}, | ||
1029 | {0}, | 1030 | {0}, |
1030 | }; | 1031 | }; |
1031 | 1032 | ||
@@ -1075,7 +1076,7 @@ static struct dvb_usb_device_properties af9005_properties = { | |||
1075 | .rc_key_map_size = 0, | 1076 | .rc_key_map_size = 0, |
1076 | .rc_query = af9005_rc_query, | 1077 | .rc_query = af9005_rc_query, |
1077 | 1078 | ||
1078 | .num_device_descs = 2, | 1079 | .num_device_descs = 3, |
1079 | .devices = { | 1080 | .devices = { |
1080 | {.name = "Afatech DVB-T USB1.1 stick", | 1081 | {.name = "Afatech DVB-T USB1.1 stick", |
1081 | .cold_ids = {&af9005_usb_table[0], NULL}, | 1082 | .cold_ids = {&af9005_usb_table[0], NULL}, |
@@ -1085,6 +1086,10 @@ static struct dvb_usb_device_properties af9005_properties = { | |||
1085 | .cold_ids = {&af9005_usb_table[1], NULL}, | 1086 | .cold_ids = {&af9005_usb_table[1], NULL}, |
1086 | .warm_ids = {NULL}, | 1087 | .warm_ids = {NULL}, |
1087 | }, | 1088 | }, |
1089 | {.name = "Ansonic DVB-T USB1.1 stick", | ||
1090 | .cold_ids = {&af9005_usb_table[2], NULL}, | ||
1091 | .warm_ids = {NULL}, | ||
1092 | }, | ||
1088 | {NULL}, | 1093 | {NULL}, |
1089 | } | 1094 | } |
1090 | }; | 1095 | }; |
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h index c94d993a6eff..aee5a6ef8217 100644 --- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h +++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h | |||
@@ -15,6 +15,7 @@ | |||
15 | #define USB_VID_ALCOR_MICRO 0x058f | 15 | #define USB_VID_ALCOR_MICRO 0x058f |
16 | #define USB_VID_ALINK 0x05e3 | 16 | #define USB_VID_ALINK 0x05e3 |
17 | #define USB_VID_ANCHOR 0x0547 | 17 | #define USB_VID_ANCHOR 0x0547 |
18 | #define USB_VID_ANSONIC 0x10b9 | ||
18 | #define USB_VID_ANUBIS_ELECTRONIC 0x10fd | 19 | #define USB_VID_ANUBIS_ELECTRONIC 0x10fd |
19 | #define USB_VID_AVERMEDIA 0x07ca | 20 | #define USB_VID_AVERMEDIA 0x07ca |
20 | #define USB_VID_COMPRO 0x185b | 21 | #define USB_VID_COMPRO 0x185b |
@@ -53,6 +54,7 @@ | |||
53 | #define USB_PID_ADSTECH_USB2_WARM 0xa334 | 54 | #define USB_PID_ADSTECH_USB2_WARM 0xa334 |
54 | #define USB_PID_AFATECH_AF9005 0x9020 | 55 | #define USB_PID_AFATECH_AF9005 0x9020 |
55 | #define USB_VID_ALINK_DTU 0xf170 | 56 | #define USB_VID_ALINK_DTU 0xf170 |
57 | #define USB_PID_ANSONIC_DVBT_USB 0x6000 | ||
56 | #define USB_PID_AVERMEDIA_DVBT_USB_COLD 0x0001 | 58 | #define USB_PID_AVERMEDIA_DVBT_USB_COLD 0x0001 |
57 | #define USB_PID_AVERMEDIA_DVBT_USB_WARM 0x0002 | 59 | #define USB_PID_AVERMEDIA_DVBT_USB_WARM 0x0002 |
58 | #define USB_PID_AVERMEDIA_DVBT_USB2_COLD 0xa800 | 60 | #define USB_PID_AVERMEDIA_DVBT_USB2_COLD 0xa800 |