From 55df654ab00e1484bd66c91ac2f922ceb83bfcd9 Mon Sep 17 00:00:00 2001
From: Michael Krufky <mkrufky@linuxtv.org>
Date: Sun, 16 Dec 2007 22:02:26 -0300
Subject: [PATCH] --- yaml --- r: 76605 b: refs/heads/master c:
 f7f427e4cc6078e23078dcd7f321676e0b0f544c h: refs/heads/master i:   76603:
 16e090dd9896f2c66ef7cd7b05c53f73b66fbfb6 v: v3

---
 [refs]                                   |  2 +-
 trunk/drivers/media/video/tuner-core.c   | 21 +++++++++++++++++++++
 trunk/drivers/media/video/tuner-driver.h | 23 -----------------------
 3 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/[refs] b/[refs]
index 97fb71a69301..975b6bb132be 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 790ba18ec7a5f15c854f52835b0e6f39de2369dd
+refs/heads/master: f7f427e4cc6078e23078dcd7f321676e0b0f544c
diff --git a/trunk/drivers/media/video/tuner-core.c b/trunk/drivers/media/video/tuner-core.c
index d51f3afa969d..f22c41bb97ef 100644
--- a/trunk/drivers/media/video/tuner-core.c
+++ b/trunk/drivers/media/video/tuner-core.c
@@ -33,6 +33,27 @@
 
 #define PREFIX t->i2c->driver->driver.name
 
+struct tuner {
+	/* device */
+	struct dvb_frontend fe;
+	struct i2c_client   *i2c;
+	struct list_head    list;
+	unsigned int        using_v4l2:1;
+
+	/* keep track of the current settings */
+	v4l2_std_id         std;
+	unsigned int        tv_freq;
+	unsigned int        radio_freq;
+	unsigned int        audmode;
+
+	unsigned int        mode;
+	unsigned int        mode_mask; /* Combination of allowable modes */
+
+	unsigned int        type; /* chip type id */
+	unsigned int        config;
+	int (*tuner_callback) (void *dev, int command, int arg);
+};
+
 /* standard i2c insmod options */
 static unsigned short normal_i2c[] = {
 #if defined(CONFIG_TUNER_TEA5761) || (defined(CONFIG_TUNER_TEA5761_MODULE) && defined(MODULE))
diff --git a/trunk/drivers/media/video/tuner-driver.h b/trunk/drivers/media/video/tuner-driver.h
index 417753b7c3fa..7b1adfaf7aca 100644
--- a/trunk/drivers/media/video/tuner-driver.h
+++ b/trunk/drivers/media/video/tuner-driver.h
@@ -50,27 +50,4 @@ struct analog_tuner_ops {
 	int (*set_config)(struct dvb_frontend *fe, void *priv_cfg);
 };
 
-struct tuner {
-	/* device */
-	struct i2c_client *i2c;
-	struct list_head list;  /* list of tuners */
-
-	unsigned int type;	/* chip type */
-
-	unsigned int mode;
-	unsigned int mode_mask;	/* Combination of allowable modes */
-
-	unsigned int tv_freq;	/* keep track of the current settings */
-	unsigned int radio_freq;
-	unsigned int audmode;
-	v4l2_std_id  std;
-
-	int          using_v4l2;
-
-	struct dvb_frontend fe;
-
-	unsigned int config;
-	int (*tuner_callback) (void *dev, int command,int arg);
-};
-
 #endif /* __TUNER_DRIVER_H__ */