]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
[media] mt2063: Fix the driver to make it compile
authorMauro Carvalho Chehab <mchehab@redhat.com>
Wed, 20 Jul 2011 23:58:25 +0000 (20:58 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Thu, 5 Jan 2012 00:16:22 +0000 (22:16 -0200)
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/common/tuners/mt2063.c
drivers/media/common/tuners/mt2063.h

index 1d36e51c40484aab46e99a159d2c691303bcac55..cd3b206adf1a290a4399f3dfd84052cc4016b38a 100644 (file)
@@ -4,7 +4,6 @@
 #include <linux/module.h>
 #include <linux/string.h>
 
-#include "drxk_type.h"
 #include "mt2063.h"
 
 /*  Version of this module                          */
index 8fa4411d30d90111da72f03b9dff1d7b60cd598e..80af9afc69b0fe61ce7980fe08a845620b857c6f 100644 (file)
@@ -1,9 +1,19 @@
 #ifndef __MT2063_H__
 #define __MT2063_H__
 
-#include <linux/dvb/frontend.h>
 #include "dvb_frontend.h"
 
+enum Bool_t {
+  FALSE = 0,
+  TRUE
+};
+
+typedef unsigned long  u32_t;
+
+#define DVBFE_TUNER_OPEN                       99
+#define DVBFE_TUNER_SOFTWARE_SHUTDOWN          100
+#define DVBFE_TUNER_CLEAR_POWER_MASKBITS       101
+
 #define MT2063_ERROR (1 << 31)
 #define MT2063_USER_ERROR (1 << 30)
 
@@ -618,17 +628,16 @@ struct mt2063_state {
        u32 reference;
 };
 
-#if defined(CONFIG_DVB_MT2063) || (defined(CONFIG_DVB_MT2063_MODULE) && defined(MODULE))
-
-extern struct dvb_frontend *mt2063_attach(struct dvb_frontend *fe,
-                                         struct mt2063_config *config,
-                                         struct i2c_adapter *i2c);
+#if defined(CONFIG_MEDIA_TUNER_MT2063) || (defined(CONFIG_MEDIA_TUNER_MT2063_MODULE) && defined(MODULE))
+struct dvb_frontend *mt2063_attach(struct dvb_frontend *fe,
+                                  struct mt2063_config *config,
+                                  struct i2c_adapter *i2c);
 
 #else
 
 static inline struct dvb_frontend *mt2063_attach(struct dvb_frontend *fe,
-                                                struct mt2063_config *config,
-                                                struct i2c_adapter *i2c)
+                                  struct mt2063_config *config,
+                                  struct i2c_adapter *i2c)
 {
        printk(KERN_WARNING "%s: Driver disabled by Kconfig\n", __func__);
        return NULL;