---

yaml --- r: 241989 b: refs/heads/master c: 5265ea5 h: refs/heads/master i: 241987: e15b6e9 v: v3
git-mirror · Mar 21, 2011 · 993c07b · 993c07b
1 parent 3481702
commit 993c07b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 738e8ff90fae01dccc9e7f92e0cfa4819567dbb8
+refs/heads/master: 5265ea54bf442cef83bcbb8b5da03d1fdb37bcb8
diff --git a/trunk/drivers/media/dvb/dvb-usb/dw2102.c b/trunk/drivers/media/dvb/dvb-usb/dw2102.c
@@ -1440,6 +1440,7 @@ static struct usb_device_id dw2102_table[] = {
 	{USB_DEVICE(USB_VID_TERRATEC, 0x00a8)},
 	{USB_DEVICE(0x9022, USB_PID_TEVII_S480_1)},
 	{USB_DEVICE(0x9022, USB_PID_TEVII_S480_2)},
+	{USB_DEVICE(0x1f4d, 0x3100)},
 	{ }
 };
 
@@ -1813,7 +1814,7 @@ static struct dvb_usb_device_properties su3000_properties = {
 			}
 		}
 	},
-	.num_device_descs = 2,
+	.num_device_descs = 3,
 	.devices = {
 		{ "SU3000HD DVB-S USB2.0",
 			{ &dw2102_table[10], NULL },
@@ -1823,6 +1824,10 @@ static struct dvb_usb_device_properties su3000_properties = {
 			{ &dw2102_table[11], NULL },
 			{ NULL },
 		},
+		{ "X3M TV SPC1400HD PCI",
+			{ &dw2102_table[14], NULL },
+			{ NULL },
+		},
 	}
 };