aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/dvb/dvb-usb/af9015.c8
-rw-r--r--drivers/media/dvb/dvb-usb/dvb-usb-ids.h2
2 files changed, 9 insertions, 1 deletions
diff --git a/drivers/media/dvb/dvb-usb/af9015.c b/drivers/media/dvb/dvb-usb/af9015.c
index a284648094c2..505432b10b8d 100644
--- a/drivers/media/dvb/dvb-usb/af9015.c
+++ b/drivers/media/dvb/dvb-usb/af9015.c
@@ -1196,6 +1196,7 @@ static struct usb_device_id af9015_usb_table[] = {
1196/* 10 */{USB_DEVICE(USB_VID_XTENSIONS, USB_PID_XTENSIONS_XD_380)}, 1196/* 10 */{USB_DEVICE(USB_VID_XTENSIONS, USB_PID_XTENSIONS_XD_380)},
1197 {USB_DEVICE(USB_VID_MSI_2, USB_PID_MSI_DIGIVOX_DUO)}, 1197 {USB_DEVICE(USB_VID_MSI_2, USB_PID_MSI_DIGIVOX_DUO)},
1198 {USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_VOLAR_X_2)}, 1198 {USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_VOLAR_X_2)},
1199 {USB_DEVICE(USB_VID_TELESTAR, USB_PID_TELESTAR)},
1199 {0}, 1200 {0},
1200}; 1201};
1201MODULE_DEVICE_TABLE(usb, af9015_usb_table); 1202MODULE_DEVICE_TABLE(usb, af9015_usb_table);
@@ -1346,7 +1347,7 @@ static struct dvb_usb_device_properties af9015_properties[] = {
1346 1347
1347 .i2c_algo = &af9015_i2c_algo, 1348 .i2c_algo = &af9015_i2c_algo,
1348 1349
1349 .num_device_descs = 3, 1350 .num_device_descs = 4,
1350 .devices = { 1351 .devices = {
1351 { 1352 {
1352 .name = "Xtensions XD-380", 1353 .name = "Xtensions XD-380",
@@ -1363,6 +1364,11 @@ static struct dvb_usb_device_properties af9015_properties[] = {
1363 .cold_ids = {&af9015_usb_table[12], NULL}, 1364 .cold_ids = {&af9015_usb_table[12], NULL},
1364 .warm_ids = {NULL}, 1365 .warm_ids = {NULL},
1365 }, 1366 },
1367 {
1368 .name = "Telestar USB DVB-T",
1369 .cold_ids = {&af9015_usb_table[13], NULL},
1370 .warm_ids = {NULL},
1371 },
1366 } 1372 }
1367 } 1373 }
1368}; 1374};
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
index 2558f2b51c2b..60c241e0236f 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -46,6 +46,7 @@
46#define USB_VID_PINNACLE 0x2304 46#define USB_VID_PINNACLE 0x2304
47#define USB_VID_TECHNOTREND 0x0b48 47#define USB_VID_TECHNOTREND 0x0b48
48#define USB_VID_TERRATEC 0x0ccd 48#define USB_VID_TERRATEC 0x0ccd
49#define USB_VID_TELESTAR 0x10b9
49#define USB_VID_VISIONPLUS 0x13d3 50#define USB_VID_VISIONPLUS 0x13d3
50#define USB_VID_TWINHAN 0x1822 51#define USB_VID_TWINHAN 0x1822
51#define USB_VID_ULTIMA_ELECTRONIC 0x05d8 52#define USB_VID_ULTIMA_ELECTRONIC 0x05d8
@@ -224,5 +225,6 @@
224#define USB_PID_YUAN_EC372S 0x1edc 225#define USB_PID_YUAN_EC372S 0x1edc
225#define USB_PID_DW2102 0x2102 226#define USB_PID_DW2102 0x2102
226#define USB_PID_XTENSIONS_XD_380 0x0381 227#define USB_PID_XTENSIONS_XD_380 0x0381
228#define USB_PID_TELESTAR 0x8000
227 229
228#endif 230#endif