From 4474bc9aa05056ba01ae1c213cb35799ee104014 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Sat, 23 Jul 2011 11:10:10 -0300
Subject: [PATCH] --- yaml --- r: 294850 b: refs/heads/master c:
 067fb88c9d423d67dbf432010b3bfc5336a2bbed h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index fb362991d25b..69fabeef2590 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 25c1646670fb4220c6c3ca91e1423c6aa76b3f87
+refs/heads/master: 067fb88c9d423d67dbf432010b3bfc5336a2bbed
diff --git a/trunk/drivers/media/dvb/dvb-usb/az6007.c b/trunk/drivers/media/dvb/dvb-usb/az6007.c
index f946b1b65b1d..780a480fb703 100644
--- a/trunk/drivers/media/dvb/dvb-usb/az6007.c
+++ b/trunk/drivers/media/dvb/dvb-usb/az6007.c
@@ -27,10 +27,6 @@
 
 #define DVB_USB_LOG_PREFIX "az6007"
 
-/* HACK: Should be moved to the right place */
-#define USB_PID_AZUREWAVE_6007		0x0ccd
-#define USB_PID_TERRATEC_H7		0x10b4
-
 /* debug */
 int dvb_usb_az6007_debug;
 module_param_named(debug, dvb_usb_az6007_debug, int, 0644);
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 d390ddaa5a53..b3e7be4718a6 100644
--- a/trunk/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/trunk/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -80,6 +80,7 @@
 #define USB_PID_ANSONIC_DVBT_USB			0x6000
 #define USB_PID_ANYSEE					0x861f
 #define USB_PID_AZUREWAVE_AD_TU700			0x3237
+#define USB_PID_AZUREWAVE_6007				0x0ccd
 #define USB_PID_AVERMEDIA_DVBT_USB_COLD			0x0001
 #define USB_PID_AVERMEDIA_DVBT_USB_WARM			0x0002
 #define USB_PID_AVERMEDIA_DVBT_USB2_COLD		0xa800
@@ -226,6 +227,7 @@
 #define USB_PID_TERRATEC_CINERGY_T_EXPRESS		0x0062
 #define USB_PID_TERRATEC_CINERGY_T_XXS			0x0078
 #define USB_PID_TERRATEC_CINERGY_T_XXS_2		0x00ab
+#define USB_PID_TERRATEC_H7				0x10b4
 #define USB_PID_TERRATEC_T3				0x10a0
 #define USB_PID_TERRATEC_T5				0x10a1
 #define USB_PID_PINNACLE_EXPRESSCARD_320CX		0x022e