Skip to content

Commit

Permalink
[media] mt2063: Fix the driver to make it compile
Browse files Browse the repository at this point in the history
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Mauro Carvalho Chehab committed Jan 5, 2012
1 parent 0ff4843 commit b675668
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 9 deletions.
1 change: 0 additions & 1 deletion drivers/media/common/tuners/mt2063.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
#include <linux/module.h>
#include <linux/string.h>

#include "drxk_type.h"
#include "mt2063.h"

/* Version of this module */
Expand Down
25 changes: 17 additions & 8 deletions drivers/media/common/tuners/mt2063.h
Original file line number Diff line number Diff line change
@@ -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)

Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit b675668

Please sign in to comment.