From b7a74f275d366124ceef2882e232665b772a75c1 Mon Sep 17 00:00:00 2001
From: Antti Palosaari <crope@iki.fi>
Date: Sat, 23 Oct 2010 07:35:31 -0300
Subject: [PATCH] --- yaml --- r: 219531 b: refs/heads/master c:
 f8c612744359179c6c90faccb6b0ca185cb65d15 h: refs/heads/master i:   219529:
 ce731aba222d7e5bc246ed8e27c2eaa74e125cb3   219527:
 c876f728674a35c234bc296970ad46a81be715a0 v: v3

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

diff --git a/[refs] b/[refs]
index cf9dd58b69e8..0b02dc0b7a99 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bd864ce353ac8b631460c058ebdafd7253dd5582
+refs/heads/master: f8c612744359179c6c90faccb6b0ca185cb65d15
diff --git a/trunk/drivers/media/dvb/dvb-usb/af9015.c b/trunk/drivers/media/dvb/dvb-usb/af9015.c
index 580ed14e5543..3ef19a83418c 100644
--- a/trunk/drivers/media/dvb/dvb-usb/af9015.c
+++ b/trunk/drivers/media/dvb/dvb-usb/af9015.c
@@ -754,6 +754,8 @@ static const struct af9015_rc_setup af9015_rc_setup_usbids[] = {
 		RC_MAP_TREKSTOR },
 	{ (USB_VID_KWORLD_2 << 16) + USB_PID_TINYTWIN_2,
 		RC_MAP_DIGITALNOW_TINYTWIN },
+	{ (USB_VID_GTEK << 16) + USB_PID_TINYTWIN_3,
+		RC_MAP_DIGITALNOW_TINYTWIN },
 	{ }
 };
 
@@ -1285,6 +1287,7 @@ static struct usb_device_id af9015_usb_table[] = {
 	{USB_DEVICE(USB_VID_TERRATEC,
 		USB_PID_TERRATEC_CINERGY_T_STICK_DUAL_RC)},
 /* 35 */{USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_A850T)},
+	{USB_DEVICE(USB_VID_GTEK,      USB_PID_TINYTWIN_3)},
 	{0},
 };
 MODULE_DEVICE_TABLE(usb, af9015_usb_table);
@@ -1380,7 +1383,8 @@ static struct dvb_usb_device_properties af9015_properties[] = {
 			{
 				.name = "DigitalNow TinyTwin DVB-T Receiver",
 				.cold_ids = {&af9015_usb_table[5],
-					     &af9015_usb_table[28], NULL},
+					     &af9015_usb_table[28],
+					     &af9015_usb_table[36], 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 cea77673c94b..192a40ce583d 100644
--- a/trunk/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/trunk/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -32,6 +32,7 @@
 #define USB_VID_EMPIA				0xeb1a
 #define USB_VID_GENPIX				0x09c0
 #define USB_VID_GRANDTEC			0x5032
+#define USB_VID_GTEK				0x1f4d
 #define USB_VID_HANFTEK				0x15f4
 #define USB_VID_HAUPPAUGE			0x2040
 #define USB_VID_HYPER_PALTEK			0x1025
@@ -145,6 +146,7 @@
 #define USB_PID_TWINHAN_VP7021_WARM			0x3208
 #define USB_PID_TINYTWIN				0x3226
 #define USB_PID_TINYTWIN_2				0xe402
+#define USB_PID_TINYTWIN_3				0x9016
 #define USB_PID_DNTV_TINYUSB2_COLD			0x3223
 #define USB_PID_DNTV_TINYUSB2_WARM			0x3224
 #define USB_PID_ULTIMA_TVBOX_COLD			0x8105