From 40dd914392d9d6c5904787696ebff4732028efca Mon Sep 17 00:00:00 2001
From: Andy Walls <awalls@radix.net>
Date: Sat, 21 Feb 2009 22:35:11 -0300
Subject: [PATCH] --- yaml --- r: 138013 b: refs/heads/master c:
 8d037ed14d1be0eff67fed0f9b1b333b0d52ec78 h: refs/heads/master i:   138011:
 4214a0f85427943010835689c443b2040ac8347a v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/media/video/cx18/cx18-driver.c | 8 +++-----
 trunk/drivers/media/video/cx18/cx18-driver.h | 3 ---
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 983fb80ad342..ac11e119594b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6246d4e1b30aa9404d2603dc09a823aba36d9c13
+refs/heads/master: 8d037ed14d1be0eff67fed0f9b1b333b0d52ec78
diff --git a/trunk/drivers/media/video/cx18/cx18-driver.c b/trunk/drivers/media/video/cx18/cx18-driver.c
index fcc40bf37f2f..f3b0c946d45d 100644
--- a/trunk/drivers/media/video/cx18/cx18-driver.c
+++ b/trunk/drivers/media/video/cx18/cx18-driver.c
@@ -884,13 +884,11 @@ static int __devinit cx18_probe(struct pci_dev *pci_dev,
 
 	cx18_init_subdevs(cx);
 
-	if (cx->std & V4L2_STD_525_60) {
+	if (cx->std & V4L2_STD_525_60)
 		cx->is_60hz = 1;
-		cx->is_out_60hz = 1;
-	} else {
+	else
 		cx->is_50hz = 1;
-		cx->is_out_50hz = 1;
-	}
+
 	cx->params.video_gop_size = cx->is_60hz ? 15 : 12;
 
 	if (cx->options.radio > 0)
diff --git a/trunk/drivers/media/video/cx18/cx18-driver.h b/trunk/drivers/media/video/cx18/cx18-driver.h
index 5e1ae91d5325..ece4f281ef42 100644
--- a/trunk/drivers/media/video/cx18/cx18-driver.h
+++ b/trunk/drivers/media/video/cx18/cx18-driver.h
@@ -505,8 +505,6 @@ struct cx18 {
 	const struct cx18_card_tuner_i2c *card_i2c; /* i2c addresses to probe for tuner */
 	u8 is_50hz;
 	u8 is_60hz;
-	u8 is_out_50hz; /* FIXME - remove, we don't have an output decoder */
-	u8 is_out_60hz; /* FIXME - remove, we don't have an output decoder */
 	u8 nof_inputs;		/* number of video inputs */
 	u8 nof_audio_inputs;	/* number of audio inputs */
 	u16 buffer_id;		/* buffer ID counter */
@@ -591,7 +589,6 @@ struct cx18 {
 	/* codec settings */
 	u32 audio_input;
 	u32 active_input;
-	u32 active_output;
 	v4l2_std_id std;
 	v4l2_std_id tuner_std;	/* The norm of the tuner (fixed) */
 };