From f06fd4213d15663f32b1ddcd2852f755138327ad Mon Sep 17 00:00:00 2001
From: Sascha Sommer <saschasommer@freenet.de>
Date: Sun, 8 Jan 2012 16:41:22 -0300
Subject: [PATCH] --- yaml --- r: 285781 b: refs/heads/master c:
 53b667eb12edd1bb33beca73ab14dbdf4d536c37 h: refs/heads/master i:   285779:
 50c556957ac8cf058b263ff5bf3457e73128286e v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/media/video/em28xx/em28xx-cards.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 205c461e5c01..5488c694f636 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1020d13d50d0a5bfcfc8a0a6826ed221cdf8a775
+refs/heads/master: 53b667eb12edd1bb33beca73ab14dbdf4d536c37
diff --git a/trunk/drivers/media/video/em28xx/em28xx-cards.c b/trunk/drivers/media/video/em28xx/em28xx-cards.c
index 21cc910ecd83..9deb5698ec21 100644
--- a/trunk/drivers/media/video/em28xx/em28xx-cards.c
+++ b/trunk/drivers/media/video/em28xx/em28xx-cards.c
@@ -1179,7 +1179,7 @@ struct em28xx_board em28xx_boards[] = {
 		.name         = "Terratec Cinergy 200 USB",
 		.is_em2800    = 1,
 		.has_ir_i2c   = 1,
-		.tuner_type   = TUNER_LG_PAL_NEW_TAPC,
+		.tuner_type   = TUNER_LG_TALN,
 		.tda9887_conf = TDA9887_PRESENT,
 		.decoder      = EM28XX_SAA711X,
 		.input        = { {