aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2007-11-02 10:16:35 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-05-17 23:39:53 -0400
commit2c9a95ba17bfe5fc24a1f782c172c03b74fcda1e (patch)
tree354935e9e7262ded03ad81101f9b896263011c16
parent5200401ad8a80b95b3ba5636580f10adc74b6b60 (diff)
V4L/DVB (12809): tm6000: Remove an old hack
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/staging/tm6000/tm6000-core.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/staging/tm6000/tm6000-core.c b/drivers/staging/tm6000/tm6000-core.c
index ddd61ca3d1d0..af97a2391123 100644
--- a/drivers/staging/tm6000/tm6000-core.c
+++ b/drivers/staging/tm6000/tm6000-core.c
@@ -30,10 +30,6 @@
30#include <media/v4l2-common.h> 30#include <media/v4l2-common.h>
31#include <media/tuner.h> 31#include <media/tuner.h>
32 32
33#ifdef HACK /* HACK */
34#include "tm6000-hack.c"
35#endif
36
37#define USB_TIMEOUT 5*HZ /* ms */ 33#define USB_TIMEOUT 5*HZ /* ms */
38 34
39int tm6000_read_write_usb (struct tm6000_core *dev, u8 req_type, u8 req, 35int tm6000_read_write_usb (struct tm6000_core *dev, u8 req_type, u8 req,
@@ -313,11 +309,6 @@ int tm6000_init (struct tm6000_core *dev)
313{ 309{
314 int board, rc=0, i; 310 int board, rc=0, i;
315 311
316#ifdef HACK /* HACK */
317 init_tm6000(dev);
318 return 0;
319#else
320
321 /* Load board's initialization table */ 312 /* Load board's initialization table */
322 for (i=0; i< ARRAY_SIZE(init_tab); i++) { 313 for (i=0; i< ARRAY_SIZE(init_tab); i++) {
323 rc= tm6000_set_reg (dev, REQ_07_SET_GET_AVREG, 314 rc= tm6000_set_reg (dev, REQ_07_SET_GET_AVREG,
@@ -375,8 +366,6 @@ int tm6000_init (struct tm6000_core *dev)
375 366
376 msleep(50); 367 msleep(50);
377 368
378#endif /* HACK */
379
380 return 0; 369 return 0;
381} 370}
382 371