From d532ccc9d0809043945e071e09777f03a7d522b4 Mon Sep 17 00:00:00 2001
From: Philipp Dreimann <philipp@dreimann.net>
Date: Sun, 2 Sep 2012 19:30:54 -0300
Subject: [PATCH] --- yaml --- r: 331028 b: refs/heads/master c:
 6d60805fd2e8103fafa02fcf6448446229ebd511 h: refs/heads/master v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/media/dvb-core/dvb-usb-ids.h    | 1 +
 trunk/drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 35c09798c545..5b4273821fc9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 89fd5ef8fa7d397ef90f5e304dfef48fe54ba257
+refs/heads/master: 6d60805fd2e8103fafa02fcf6448446229ebd511
diff --git a/trunk/drivers/media/dvb-core/dvb-usb-ids.h b/trunk/drivers/media/dvb-core/dvb-usb-ids.h
index 26c44818a5ab..fed6dcddc395 100644
--- a/trunk/drivers/media/dvb-core/dvb-usb-ids.h
+++ b/trunk/drivers/media/dvb-core/dvb-usb-ids.h
@@ -82,6 +82,7 @@
 #define USB_PID_AFATECH_AF9035_1003			0x1003
 #define USB_PID_AFATECH_AF9035_9035			0x9035
 #define USB_PID_TREKSTOR_DVBT				0x901b
+#define USB_PID_TREKSTOR_TERRES_2_0			0xC803
 #define USB_VID_ALINK_DTU				0xf170
 #define USB_PID_ANSONIC_DVBT_USB			0x6000
 #define USB_PID_ANYSEE					0x861f
diff --git a/trunk/drivers/media/usb/dvb-usb-v2/rtl28xxu.c b/trunk/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
index 88b5ea12ed28..d0d23f2c1fe7 100644
--- a/trunk/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
+++ b/trunk/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
@@ -1236,6 +1236,8 @@ static const struct usb_device_id rtl28xxu_id_table[] = {
 		&rtl2832u_props, "NOXON DAB/DAB+ USB dongle", NULL) },
 	{ DVB_USB_DEVICE(USB_VID_REALTEK, 0x2838,
 		&rtl2832u_props, "Realtek RTL2832U reference design", NULL) },
+	{ DVB_USB_DEVICE(USB_VID_GTEK, USB_PID_TREKSTOR_TERRES_2_0,
+		&rtl2832u_props, "Trekstor DVB-T Stick Terres 2.0", NULL) },
 	{ }
 };
 MODULE_DEVICE_TABLE(usb, rtl28xxu_id_table);