From bc56612ce9df98dda0245bd5a1ce60d49f420268 Mon Sep 17 00:00:00 2001
From: Herbert Graeber <herbert@graeber-clan.de>
Date: Tue, 7 Oct 2008 10:06:36 -0300
Subject: [PATCH] --- yaml --- r: 114076 b: refs/heads/master c:
 641015ab2c452e8e554625e2a8e95218182acb4b h: refs/heads/master v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/media/dvb/dvb-usb/af9015.c      | 8 +++++++-
 trunk/drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 1 +
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5f046871018e..a63978cdeca5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 541dfa87f9285b2ff7e703a5eab81ad821de7f6e
+refs/heads/master: 641015ab2c452e8e554625e2a8e95218182acb4b
diff --git a/trunk/drivers/media/dvb/dvb-usb/af9015.c b/trunk/drivers/media/dvb/dvb-usb/af9015.c
index 67b13062a148..cb0829c038ce 100644
--- a/trunk/drivers/media/dvb/dvb-usb/af9015.c
+++ b/trunk/drivers/media/dvb/dvb-usb/af9015.c
@@ -1196,6 +1196,7 @@ static struct usb_device_id af9015_usb_table[] = {
 	{USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_VOLAR_X_2)},
 	{USB_DEVICE(USB_VID_TELESTAR,  USB_PID_TELESTAR_STARSTICK_2)},
 	{USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_A309)},
+/* 15 */{USB_DEVICE(USB_VID_MSI_2,     USB_PID_MSI_DIGI_VOX_MINI_III)},
 	{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 = 5,
+		.num_device_descs = 6,
 		.devices = {
 			{
 				.name = "Xtensions XD-380",
@@ -1373,6 +1374,11 @@ static struct dvb_usb_device_properties af9015_properties[] = {
 				.cold_ids = {&af9015_usb_table[14], NULL},
 				.warm_ids = {NULL},
 			},
+			{
+				.name = "MSI Digi VOX mini III",
+				.cold_ids = {&af9015_usb_table[15], NULL},
+				.warm_ids = {NULL},
+			},
 		}
 	}
 };
diff --git a/trunk/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/trunk/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
index dfaf1d2574db..7380b94b3b36 100644
--- a/trunk/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/trunk/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -232,5 +232,6 @@
 #define USB_PID_DW2102					0x2102
 #define USB_PID_XTENSIONS_XD_380			0x0381
 #define USB_PID_TELESTAR_STARSTICK_2			0x8000
+#define USB_PID_MSI_DIGI_VOX_MINI_III                   0x8807
 
 #endif