From 863ea40b30d5a066aba01dba674bf682ae305872 Mon Sep 17 00:00:00 2001
From: Mikko Ohtamaa <mikko@redinnovation.com>
Date: Fri, 19 Sep 2008 18:26:05 -0300
Subject: [PATCH] --- yaml --- r: 113943 b: refs/heads/master c:
 111f9ecf174655f3da2b266602f20f11e6a6a4c7 h: refs/heads/master i:   113941:
 ab57be756f05e4e1a0218657274f2aa7758d218b   113939:
 de8a766a33abf223b7a117e8278db72297f5ffb7   113935:
 bfcadd908e032cf17d7e273e1b3496db158512da v: v3

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

diff --git a/[refs] b/[refs]
index 02b1a39fe8dd..82edeb6e6d4b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 28f947a95386861c54de2bf7753dda011c8e15c3
+refs/heads/master: 111f9ecf174655f3da2b266602f20f11e6a6a4c7
diff --git a/trunk/drivers/media/dvb/dvb-usb/af9015.c b/trunk/drivers/media/dvb/dvb-usb/af9015.c
index a284648094c2..505432b10b8d 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[] = {
 /* 10 */{USB_DEVICE(USB_VID_XTENSIONS, USB_PID_XTENSIONS_XD_380)},
 	{USB_DEVICE(USB_VID_MSI_2,     USB_PID_MSI_DIGIVOX_DUO)},
 	{USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_VOLAR_X_2)},
+	{USB_DEVICE(USB_VID_TELESTAR, USB_PID_TELESTAR)},
 	{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 = 3,
+		.num_device_descs = 4,
 		.devices = {
 			{
 				.name = "Xtensions XD-380",
@@ -1363,6 +1364,11 @@ static struct dvb_usb_device_properties af9015_properties[] = {
 				.cold_ids = {&af9015_usb_table[12], NULL},
 				.warm_ids = {NULL},
 			},
+			{
+				.name = "Telestar USB DVB-T",
+				.cold_ids = {&af9015_usb_table[13], 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 2558f2b51c2b..60c241e0236f 100644
--- a/trunk/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/trunk/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -46,6 +46,7 @@
 #define USB_VID_PINNACLE			0x2304
 #define USB_VID_TECHNOTREND			0x0b48
 #define USB_VID_TERRATEC			0x0ccd
+#define USB_VID_TELESTAR			0x10b9
 #define USB_VID_VISIONPLUS			0x13d3
 #define USB_VID_TWINHAN				0x1822
 #define USB_VID_ULTIMA_ELECTRONIC		0x05d8
@@ -224,5 +225,6 @@
 #define USB_PID_YUAN_EC372S				0x1edc
 #define USB_PID_DW2102					0x2102
 #define USB_PID_XTENSIONS_XD_380			0x0381
+#define USB_PID_TELESTAR				0x8000
 
 #endif