---

yaml --- r: 76633 b: refs/heads/master c: 807ffe8 h: refs/heads/master i: 76631: c4c137d v: v3
git-mirror · Jan 25, 2008 · 7ac637a · 7ac637a
1 parent edc257f
commit 7ac637a
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 25 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b624aa86cd92b32d66653609e4896f54c0d6111d
+refs/heads/master: 807ffe8df23e1977d4e702697a08047f346eb974
diff --git a/trunk/drivers/media/dvb/dvb-core/dvb_frontend.h b/trunk/drivers/media/dvb/dvb-core/dvb_frontend.h
@@ -62,8 +62,6 @@ struct dvb_tuner_info {
 	u32 bandwidth_step;
 };
 
-struct analog_tuner_ops;
-
 struct analog_parameters {
 	unsigned int frequency;
 	unsigned int mode;
@@ -103,6 +101,28 @@ struct dvb_tuner_ops {
 	int (*set_bandwidth)(struct dvb_frontend *fe, u32 bandwidth);
 };
 
+struct analog_demod_info {
+	char *name;
+};
+
+struct analog_tuner_ops {
+
+	struct analog_demod_info info;
+
+	void (*set_params)(struct dvb_frontend *fe,
+			   struct analog_parameters *params);
+	int  (*has_signal)(struct dvb_frontend *fe);
+	int  (*is_stereo)(struct dvb_frontend *fe);
+	int  (*get_afc)(struct dvb_frontend *fe);
+	void (*tuner_status)(struct dvb_frontend *fe);
+	void (*standby)(struct dvb_frontend *fe);
+	void (*release)(struct dvb_frontend *fe);
+	int  (*i2c_gate_ctrl)(struct dvb_frontend *fe, int enable);
+
+	/** This is to allow setting tuner-specific configuration */
+	int (*set_config)(struct dvb_frontend *fe, void *priv_cfg);
+};
+
 struct dvb_frontend_ops {
 
 	struct dvb_frontend_info info;

diff --git a/trunk/drivers/media/video/tuner-driver.h b/trunk/drivers/media/video/tuner-driver.h
@@ -24,26 +24,4 @@
 
 #include "dvb_frontend.h"
 
-struct analog_demod_info {
-	char *name;
-};
-
-struct analog_tuner_ops {
-
-	struct analog_demod_info info;
-
-	void (*set_params)(struct dvb_frontend *fe,
-			   struct analog_parameters *params);
-	int  (*has_signal)(struct dvb_frontend *fe);
-	int  (*is_stereo)(struct dvb_frontend *fe);
-	int  (*get_afc)(struct dvb_frontend *fe);
-	void (*tuner_status)(struct dvb_frontend *fe);
-	void (*standby)(struct dvb_frontend *fe);
-	void (*release)(struct dvb_frontend *fe);
-	int  (*i2c_gate_ctrl)(struct dvb_frontend *fe, int enable);
-
-	/** This is to allow setting tuner-specific configuration */
-	int (*set_config)(struct dvb_frontend *fe, void *priv_cfg);
-};
-
 #endif /* __TUNER_DRIVER_H__ */