aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/common
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2011-07-20 19:58:25 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-01-04 19:16:22 -0500
commitb675668aaf33eeb0e8cbf4e9ce75f99cbf695977 (patch)
tree20e2819a6314a2b57ba1c1d05c83a828d29f474c /drivers/media/common
parent0ff4843218d15ccb76f0e17ea5203673d00cd50b (diff)
[media] mt2063: Fix the driver to make it compile
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/common')
-rw-r--r--drivers/media/common/tuners/mt2063.c1
-rw-r--r--drivers/media/common/tuners/mt2063.h25
2 files changed, 17 insertions, 9 deletions
diff --git a/drivers/media/common/tuners/mt2063.c b/drivers/media/common/tuners/mt2063.c
index 1d36e51c404..cd3b206adf1 100644
--- a/drivers/media/common/tuners/mt2063.c
+++ b/drivers/media/common/tuners/mt2063.c
@@ -4,7 +4,6 @@
4#include <linux/module.h> 4#include <linux/module.h>
5#include <linux/string.h> 5#include <linux/string.h>
6 6
7#include "drxk_type.h"
8#include "mt2063.h" 7#include "mt2063.h"
9 8
10/* Version of this module */ 9/* Version of this module */
diff --git a/drivers/media/common/tuners/mt2063.h b/drivers/media/common/tuners/mt2063.h
index 8fa4411d30d..80af9afc69b 100644
--- a/drivers/media/common/tuners/mt2063.h
+++ b/drivers/media/common/tuners/mt2063.h
@@ -1,9 +1,19 @@
1#ifndef __MT2063_H__ 1#ifndef __MT2063_H__
2#define __MT2063_H__ 2#define __MT2063_H__
3 3
4#include <linux/dvb/frontend.h>
5#include "dvb_frontend.h" 4#include "dvb_frontend.h"
6 5
6enum Bool_t {
7 FALSE = 0,
8 TRUE
9};
10
11typedef unsigned long u32_t;
12
13#define DVBFE_TUNER_OPEN 99
14#define DVBFE_TUNER_SOFTWARE_SHUTDOWN 100
15#define DVBFE_TUNER_CLEAR_POWER_MASKBITS 101
16
7#define MT2063_ERROR (1 << 31) 17#define MT2063_ERROR (1 << 31)
8#define MT2063_USER_ERROR (1 << 30) 18#define MT2063_USER_ERROR (1 << 30)
9 19
@@ -618,17 +628,16 @@ struct mt2063_state {
618 u32 reference; 628 u32 reference;
619}; 629};
620 630
621#if defined(CONFIG_DVB_MT2063) || (defined(CONFIG_DVB_MT2063_MODULE) && defined(MODULE)) 631#if defined(CONFIG_MEDIA_TUNER_MT2063) || (defined(CONFIG_MEDIA_TUNER_MT2063_MODULE) && defined(MODULE))
622 632struct dvb_frontend *mt2063_attach(struct dvb_frontend *fe,
623extern struct dvb_frontend *mt2063_attach(struct dvb_frontend *fe, 633 struct mt2063_config *config,
624 struct mt2063_config *config, 634 struct i2c_adapter *i2c);
625 struct i2c_adapter *i2c);
626 635
627#else 636#else
628 637
629static inline struct dvb_frontend *mt2063_attach(struct dvb_frontend *fe, 638static inline struct dvb_frontend *mt2063_attach(struct dvb_frontend *fe,
630 struct mt2063_config *config, 639 struct mt2063_config *config,
631 struct i2c_adapter *i2c) 640 struct i2c_adapter *i2c)
632{ 641{
633 printk(KERN_WARNING "%s: Driver disabled by Kconfig\n", __func__); 642 printk(KERN_WARNING "%s: Driver disabled by Kconfig\n", __func__);
634 return NULL; 643 return NULL;