git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
media
/
dvb
/
frontends
/
nxt200x.h
diff --git
a/drivers/media/dvb/frontends/nxt200x.h
b/drivers/media/dvb/frontends/nxt200x.h
index
1d9d70b
..
28bc559
100644
(file)
--- a/
drivers/media/dvb/frontends/nxt200x.h
+++ b/
drivers/media/dvb/frontends/nxt200x.h
@@
-38,10
+38,6
@@
struct nxt200x_config
/* the demodulator's i2c address */
u8 demod_address;
/* the demodulator's i2c address */
u8 demod_address;
- /* tuner information */
- u8 pll_address;
- struct dvb_pll_desc *pll_desc;
-
/* used to set pll input */
int (*set_pll_input)(u8* buf, int input);
/* used to set pll input */
int (*set_pll_input)(u8* buf, int input);
@@
-49,8
+45,17
@@
struct nxt200x_config
int (*set_ts_params)(struct dvb_frontend* fe, int is_punctured);
};
int (*set_ts_params)(struct dvb_frontend* fe, int is_punctured);
};
+#if defined(CONFIG_DVB_NXT200X) || (defined(CONFIG_DVB_NXT200X_MODULE) && defined(MODULE))
extern struct dvb_frontend* nxt200x_attach(const struct nxt200x_config* config,
struct i2c_adapter* i2c);
extern struct dvb_frontend* nxt200x_attach(const struct nxt200x_config* config,
struct i2c_adapter* i2c);
+#else
+static inline struct dvb_frontend* nxt200x_attach(const struct nxt200x_config* config,
+ struct i2c_adapter* i2c)
+{
+ printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__);
+ return NULL;
+}
+#endif // CONFIG_DVB_NXT200X
#endif /* NXT200X_H */
#endif /* NXT200X_H */