---

yaml --- r: 241947 b: refs/heads/master c: 2adc591 h: refs/heads/master i: 241945: f9af249 241943: 90c1816 v: v3
git-mirror · Mar 21, 2011 · 25f3e92 · 25f3e92
1 parent e1bff40
commit 25f3e92
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: d2ffc447cabb3a497d7f413403abd8793b348329
+refs/heads/master: 2adc591fb7764bf70f65a5923ff50c1c1b671c20
diff --git a/trunk/drivers/media/dvb/dvb-usb/dw2102.c b/trunk/drivers/media/dvb/dvb-usb/dw2102.c
@@ -1370,6 +1370,7 @@ static struct usb_device_id dw2102_table[] = {
 	{USB_DEVICE(0x9022, USB_PID_TEVII_S660)},
 	{USB_DEVICE(0x3034, 0x7500)},
 	{USB_DEVICE(0x1f4d, 0x3000)},
+	{USB_DEVICE(USB_VID_TERRATEC, 0x00a8)},
 	{ }
 };
 
@@ -1742,12 +1743,16 @@ static struct dvb_usb_device_properties su3000_properties = {
 			}
 		}
 	},
-	.num_device_descs = 1,
+	.num_device_descs = 2,
 	.devices = {
 		{ "SU3000HD DVB-S USB2.0",
 			{ &dw2102_table[10], NULL },
 			{ NULL },
 		},
+		{ "Terratec Cinergy S2 USB HD",
+			{ &dw2102_table[11], NULL },
+			{ NULL },
+		},
 	}
 };