aboutsummaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/tuner-core.c21
-rw-r--r--drivers/media/video/tuner-driver.h23
2 files changed, 21 insertions, 23 deletions
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c
index d51f3afa969..f22c41bb97e 100644
--- a/drivers/media/video/tuner-core.c
+++ b/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/drivers/media/video/tuner-driver.h b/drivers/media/video/tuner-driver.h
index 417753b7c3f..7b1adfaf7ac 100644
--- a/drivers/media/video/tuner-driver.h
+++ b/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__ */