aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/dvb-usb
diff options
context:
space:
mode:
authorHerbert Graeber <herbert@graeber-clan.de>2008-10-07 09:06:36 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-10-13 05:15:52 -0400
commit641015ab2c452e8e554625e2a8e95218182acb4b (patch)
treea4c7d677517872231828c6c55563b605980c553b /drivers/media/dvb/dvb-usb
parent541dfa87f9285b2ff7e703a5eab81ad821de7f6e (diff)
V4L/DVB (9147): af9015: Add USB ID for MSI DIGIVOX mini III
- Add USB ID for MSI DIGIVOX mini III (1462:8807) Signed-off-by: Herbert Graeber <herbert@graeber-clan.de> 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 67b13062a148..cb0829c038ce 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 {USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_VOLAR_X_2)}, 1196 {USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_VOLAR_X_2)},
1197 {USB_DEVICE(USB_VID_TELESTAR, USB_PID_TELESTAR_STARSTICK_2)}, 1197 {USB_DEVICE(USB_VID_TELESTAR, USB_PID_TELESTAR_STARSTICK_2)},
1198 {USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_A309)}, 1198 {USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_A309)},
1199/* 15 */{USB_DEVICE(USB_VID_MSI_2, USB_PID_MSI_DIGI_VOX_MINI_III)},
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 = 5, 1350 .num_device_descs = 6,
1350 .devices = { 1351 .devices = {
1351 { 1352 {
1352 .name = "Xtensions XD-380", 1353 .name = "Xtensions XD-380",
@@ -1373,6 +1374,11 @@ static struct dvb_usb_device_properties af9015_properties[] = {
1373 .cold_ids = {&af9015_usb_table[14], NULL}, 1374 .cold_ids = {&af9015_usb_table[14], NULL},
1374 .warm_ids = {NULL}, 1375 .warm_ids = {NULL},
1375 }, 1376 },
1377 {
1378 .name = "MSI Digi VOX mini III",
1379 .cold_ids = {&af9015_usb_table[15], NULL},
1380 .warm_ids = {NULL},
1381 },
1376 } 1382 }
1377 } 1383 }
1378}; 1384};
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
index dfaf1d2574db..7380b94b3b36 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -232,5 +232,6 @@
232#define USB_PID_DW2102 0x2102 232#define USB_PID_DW2102 0x2102
233#define USB_PID_XTENSIONS_XD_380 0x0381 233#define USB_PID_XTENSIONS_XD_380 0x0381
234#define USB_PID_TELESTAR_STARSTICK_2 0x8000 234#define USB_PID_TELESTAR_STARSTICK_2 0x8000
235#define USB_PID_MSI_DIGI_VOX_MINI_III 0x8807
235 236
236#endif 237#endif