diff --git a/[refs] b/[refs]
index 461bf323e275..2872c71b7031 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7686b574a1507ecf5fd7c419b43f26222668aa4d
+refs/heads/master: d37142102a2adaa3391a384ea6a780afb5804789
diff --git a/trunk/drivers/media/dvb/frontends/tda18271-fe.c b/trunk/drivers/media/dvb/frontends/tda18271-fe.c
index da22b24190cf..4526def2d42f 100644
--- a/trunk/drivers/media/dvb/frontends/tda18271-fe.c
+++ b/trunk/drivers/media/dvb/frontends/tda18271-fe.c
@@ -20,8 +20,6 @@
 
 #include <linux/delay.h>
 #include <linux/videodev2.h>
-
-#include "tda18271.h"
 #include "tda18271-priv.h"
 
 int tda18271_debug;
@@ -30,23 +28,6 @@ MODULE_PARM_DESC(debug, "set debug level (info=1, map=2, reg=4 (or-able))");
 
 /*---------------------------------------------------------------------*/
 
-enum tda18271_mode {
-	TDA18271_ANALOG,
-	TDA18271_DIGITAL,
-};
-
-struct tda18271_priv {
-	u8 i2c_addr;
-	struct i2c_adapter *i2c_adap;
-	unsigned char tda18271_regs[TDA18271_NUM_REGS];
-
-	enum tda18271_mode mode;
-	enum tda18271_i2c_gate gate;
-
-	u32 frequency;
-	u32 bandwidth;
-};
-
 static int tda18271_i2c_gate_ctrl(struct dvb_frontend *fe, int enable)
 {
 	struct tda18271_priv *priv = fe->tuner_priv;
diff --git a/trunk/drivers/media/dvb/frontends/tda18271-priv.h b/trunk/drivers/media/dvb/frontends/tda18271-priv.h
index e1fa9a467939..7b9aa9ad53fe 100644
--- a/trunk/drivers/media/dvb/frontends/tda18271-priv.h
+++ b/trunk/drivers/media/dvb/frontends/tda18271-priv.h
@@ -23,6 +23,7 @@
 
 #include <linux/kernel.h>
 #include <linux/types.h>
+#include "tda18271.h"
 
 #define R_ID     0x00	/* ID byte                */
 #define R_TM     0x01	/* Thermo byte            */
@@ -66,6 +67,27 @@
 
 #define TDA18271_NUM_REGS 39
 
+/*---------------------------------------------------------------------*/
+
+enum tda18271_mode {
+	TDA18271_ANALOG,
+	TDA18271_DIGITAL,
+};
+
+struct tda18271_priv {
+	u8 i2c_addr;
+	struct i2c_adapter *i2c_adap;
+	unsigned char tda18271_regs[TDA18271_NUM_REGS];
+
+	enum tda18271_mode mode;
+	enum tda18271_i2c_gate gate;
+
+	u32 frequency;
+	u32 bandwidth;
+};
+
+/*---------------------------------------------------------------------*/
+
 extern int tda18271_debug;
 
 #define dprintk(level, fmt, arg...) do {\