From e999827e86335797dd077700c3097a48ded6ad1b Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Sun, 6 Mar 2011 09:24:32 -0300
Subject: [PATCH] --- yaml --- r: 242047 b: refs/heads/master c:
 aa40d194975e23ba7a55936c7b5dae4e964461b5 h: refs/heads/master i:   242045:
 06bb90e10cc61113f71422088c39380e946f1e43   242043:
 5b87a2000248388937b359a928c915375a648d77   242039:
 7105833180e5cfb20961b246a791551cff2c0862   242031:
 3c5b697bf96f0bdd6be7b849d4465ba9608b638a   242015:
 cac7831ebaa752092c31c1f9bcb4105f709f3d2d   241983:
 fc33b4e21213bfe3b89f7bee7077c4ea88d85186   241919:
 ef5b642b7d600088dd0cb81016fd9df9295e312f v: v3

---
 [refs]                                           | 2 +-
 trunk/drivers/media/common/tuners/tuner-xc2028.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ac3b76af8beb..750a72e2e43a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e83dd485ed04b21215c1283042e8d4712ab1a675
+refs/heads/master: aa40d194975e23ba7a55936c7b5dae4e964461b5
diff --git a/trunk/drivers/media/common/tuners/tuner-xc2028.c b/trunk/drivers/media/common/tuners/tuner-xc2028.c
index efcbc3ed0aea..16fba6b59616 100644
--- a/trunk/drivers/media/common/tuners/tuner-xc2028.c
+++ b/trunk/drivers/media/common/tuners/tuner-xc2028.c
@@ -907,7 +907,7 @@ static int xc2028_signal(struct dvb_frontend *fe, u16 *strength)
 #define DIV 15625
 
 static int generic_set_freq(struct dvb_frontend *fe, u32 freq /* in HZ */,
-			    enum tuner_mode new_mode,
+			    enum v4l2_tuner_type new_type,
 			    unsigned int type,
 			    v4l2_std_id std,
 			    u16 int_freq)
@@ -933,7 +933,7 @@ static int generic_set_freq(struct dvb_frontend *fe, u32 freq /* in HZ */,
 	 * that xc2028 will be in a safe state.
 	 * Maybe this might also be needed for DTV.
 	 */
-	if (new_mode == V4L2_TUNER_ANALOG_TV) {
+	if (new_type == V4L2_TUNER_ANALOG_TV) {
 		rc = send_seq(priv, {0x00, 0x00});
 
 		/* Analog modes require offset = 0 */