From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Fri, 2 Nov 2007 14:16:35 +0000 (-0300)
Subject: V4L/DVB (12809): tm6000: Remove an old hack
X-Git-Tag: v3.12-rc1~10285^2~497
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2c9a95ba17bfe5fc24a1f782c172c03b74fcda1e;p=kernel%2Fkernel-generic.git

V4L/DVB (12809): tm6000: Remove an old hack

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---

diff --git a/drivers/staging/tm6000/tm6000-core.c b/drivers/staging/tm6000/tm6000-core.c
index ddd61ca..af97a23 100644
--- a/drivers/staging/tm6000/tm6000-core.c
+++ b/drivers/staging/tm6000/tm6000-core.c
@@ -30,10 +30,6 @@
 #include <media/v4l2-common.h>
 #include <media/tuner.h>
 
-#ifdef HACK /* HACK */
-#include "tm6000-hack.c"
-#endif
-
 #define USB_TIMEOUT	5*HZ /* ms */
 
 int tm6000_read_write_usb (struct tm6000_core *dev, u8 req_type, u8 req,
@@ -313,11 +309,6 @@ int tm6000_init (struct tm6000_core *dev)
 {
 	int board, rc=0, i;
 
-#ifdef HACK /* HACK */
-	init_tm6000(dev);
-	return 0;
-#else
-
 	/* Load board's initialization table */
 	for (i=0; i< ARRAY_SIZE(init_tab); i++) {
 		rc= tm6000_set_reg (dev, REQ_07_SET_GET_AVREG,
@@ -375,8 +366,6 @@ int tm6000_init (struct tm6000_core *dev)
 
 	msleep(50);
 
-#endif /* HACK */
-
 	return 0;
 }