aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/dvb-usb
diff options
context:
space:
mode:
authorAntti Palosaari <crope@iki.fi>2010-05-23 17:26:37 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-08-02 15:43:10 -0400
commit2606cfa3f691b844aee64485eda1629f33cbc0ee (patch)
tree7293e772e3093ba297247b40e809f4335d5afb9a /drivers/media/dvb/dvb-usb
parent4e9f5677755c8f2eda6a293139084010cbbf2044 (diff)
V4L/DVB: af9015: support for AverMedia AVerTV Volar M (A815Mac)
Add USB ID 07ca:815a for AverMedia AVerTV Volar M (A815Mac). 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.h1
2 files changed, 8 insertions, 1 deletions
diff --git a/drivers/media/dvb/dvb-usb/af9015.c b/drivers/media/dvb/dvb-usb/af9015.c
index 66c7c3ea7990..2fb24c3f4774 100644
--- a/drivers/media/dvb/dvb-usb/af9015.c
+++ b/drivers/media/dvb/dvb-usb/af9015.c
@@ -1299,6 +1299,7 @@ static struct usb_device_id af9015_usb_table[] = {
1299 {USB_DEVICE(USB_VID_LEADTEK, USB_PID_WINFAST_DTV2000DS)}, 1299 {USB_DEVICE(USB_VID_LEADTEK, USB_PID_WINFAST_DTV2000DS)},
1300/* 30 */{USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_UB383_T)}, 1300/* 30 */{USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_UB383_T)},
1301 {USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_395U_4)}, 1301 {USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_395U_4)},
1302 {USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_A815M)},
1302 {0}, 1303 {0},
1303}; 1304};
1304MODULE_DEVICE_TABLE(usb, af9015_usb_table); 1305MODULE_DEVICE_TABLE(usb, af9015_usb_table);
@@ -1572,7 +1573,7 @@ static struct dvb_usb_device_properties af9015_properties[] = {
1572 1573
1573 .i2c_algo = &af9015_i2c_algo, 1574 .i2c_algo = &af9015_i2c_algo,
1574 1575
1575 .num_device_descs = 8, /* max 9 */ 1576 .num_device_descs = 9, /* max 9 */
1576 .devices = { 1577 .devices = {
1577 { 1578 {
1578 .name = "AverMedia AVerTV Volar GPS 805 (A805)", 1579 .name = "AverMedia AVerTV Volar GPS 805 (A805)",
@@ -1617,6 +1618,11 @@ static struct dvb_usb_device_properties af9015_properties[] = {
1617 .cold_ids = {&af9015_usb_table[30], NULL}, 1618 .cold_ids = {&af9015_usb_table[30], NULL},
1618 .warm_ids = {NULL}, 1619 .warm_ids = {NULL},
1619 }, 1620 },
1621 {
1622 .name = "AverMedia AVerTV Volar M (A815Mac)",
1623 .cold_ids = {&af9015_usb_table[32], NULL},
1624 .warm_ids = {NULL},
1625 },
1620 } 1626 }
1621 }, 1627 },
1622}; 1628};
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
index b4afe6f8ed19..1a774d58d664 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -197,6 +197,7 @@
197#define USB_PID_AVERMEDIA_A310 0xa310 197#define USB_PID_AVERMEDIA_A310 0xa310
198#define USB_PID_AVERMEDIA_A850 0x850a 198#define USB_PID_AVERMEDIA_A850 0x850a
199#define USB_PID_AVERMEDIA_A805 0xa805 199#define USB_PID_AVERMEDIA_A805 0xa805
200#define USB_PID_AVERMEDIA_A815M 0x815a
200#define USB_PID_TECHNOTREND_CONNECT_S2400 0x3006 201#define USB_PID_TECHNOTREND_CONNECT_S2400 0x3006
201#define USB_PID_TECHNOTREND_CONNECT_CT3650 0x300d 202#define USB_PID_TECHNOTREND_CONNECT_CT3650 0x300d
202#define USB_PID_TERRATEC_CINERGY_DT_XS_DIVERSITY 0x005a 203#define USB_PID_TERRATEC_CINERGY_DT_XS_DIVERSITY 0x005a