aboutsummaryrefslogtreecommitdiff
path: root/drivers/media/dvb/dvb-usb
diff options
context:
space:
mode:
authorMikko Ohtamaa <mikko@redinnovation.com>2008-09-19 18:26:05 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-10-12 09:37:03 -0200
commit111f9ecf174655f3da2b266602f20f11e6a6a4c7 (patch)
tree401be1658788c6a7dfbe31c5e13eae193e7016af /drivers/media/dvb/dvb-usb
parent28f947a95386861c54de2bf7753dda011c8e15c3 (diff)
V4L/DVB (8974): af9015: Add USB ID for Telestar Starstick 2
- Add USB ID for Telestar Starstick 2 (10b9:8000) Signed-off-by: Mikko Ohtamaa <mikko@redinnovation.com> Signed-off-by: Antti Palosaari <crope@iki.fi> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb/dvb-usb')
-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 a284648094c..505432b10b8 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[] = {
/* 10 */{USB_DEVICE(USB_VID_XTENSIONS, USB_PID_XTENSIONS_XD_380)},
{USB_DEVICE(USB_VID_MSI_2, USB_PID_MSI_DIGIVOX_DUO)},
{USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_VOLAR_X_2)},
+ {USB_DEVICE(USB_VID_TELESTAR, USB_PID_TELESTAR)},
{0},
};
MODULE_DEVICE_TABLE(usb, af9015_usb_table);
@@ -1346,7 +1347,7 @@ static struct dvb_usb_device_properties af9015_properties[] = {
.i2c_algo = &af9015_i2c_algo,
- .num_device_descs = 3,
+ .num_device_descs = 4,
.devices = {
{
.name = "Xtensions XD-380",
@@ -1363,6 +1364,11 @@ static struct dvb_usb_device_properties af9015_properties[] = {
.cold_ids = {&af9015_usb_table[12], NULL},
.warm_ids = {NULL},
},
+ {
+ .name = "Telestar USB DVB-T",
+ .cold_ids = {&af9015_usb_table[13], NULL},
+ .warm_ids = {NULL},
+ },
}
}
};
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
index 2558f2b51c2..60c241e0236 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 @@
#define USB_VID_PINNACLE 0x2304
#define USB_VID_TECHNOTREND 0x0b48
#define USB_VID_TERRATEC 0x0ccd
+#define USB_VID_TELESTAR 0x10b9
#define USB_VID_VISIONPLUS 0x13d3
#define USB_VID_TWINHAN 0x1822
#define USB_VID_ULTIMA_ELECTRONIC 0x05d8
@@ -224,5 +225,6 @@
#define USB_PID_YUAN_EC372S 0x1edc
#define USB_PID_DW2102 0x2102
#define USB_PID_XTENSIONS_XD_380 0x0381
+#define USB_PID_TELESTAR 0x8000
#endif