The patch number 10900 was added via Michael Krufky <[email protected]>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
Linux Media Mailing List <[email protected]>
------
From: Michael Krufky <[email protected]>
remove build-time dependencies on dib3000mc
Priority: normal
Signed-off-by: Michael Krufky <[email protected]>
---
linux/drivers/media/dvb/frontends/dib3000mc.h | 35 ++++++++++++++----
1 file changed, 29 insertions(+), 6 deletions(-)
diff -r 4a797e5e8ea5 -r 50aef6cce25b
linux/drivers/media/dvb/frontends/dib3000mc.h
--- a/linux/drivers/media/dvb/frontends/dib3000mc.h Sun Mar 08 23:04:17
2009 -0400
+++ b/linux/drivers/media/dvb/frontends/dib3000mc.h Sun Mar 08 23:59:09
2009 -0400
@@ -40,18 +40,41 @@ struct dib3000mc_config {
#define DEFAULT_DIB3000P_I2C_ADDRESS 24
#if defined(CONFIG_DVB_DIB3000MC) || (defined(CONFIG_DVB_DIB3000MC_MODULE) &&
defined(MODULE))
-extern struct dvb_frontend * dib3000mc_attach(struct i2c_adapter *i2c_adap, u8
i2c_addr, struct dib3000mc_config *cfg);
+extern struct dvb_frontend *dib3000mc_attach(struct i2c_adapter *i2c_adap,
+ u8 i2c_addr,
+ struct dib3000mc_config *cfg);
+extern int dib3000mc_i2c_enumeration(struct i2c_adapter *i2c,
+ int no_of_demods, u8 default_addr,
+ struct dib3000mc_config cfg[]);
+extern
+struct i2c_adapter *dib3000mc_get_tuner_i2c_master(struct dvb_frontend *demod,
+ int gating);
#else
-static inline struct dvb_frontend * dib3000mc_attach(struct i2c_adapter
*i2c_adap, u8 i2c_addr, struct dib3000mc_config *cfg)
+static inline
+struct dvb_frontend *dib3000mc_attach(struct i2c_adapter *i2c_adap, u8
i2c_addr,
+ struct dib3000mc_config *cfg)
+{
+ printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
+ return NULL;
+}
+
+static inline
+int dib3000mc_i2c_enumeration(struct i2c_adapter *i2c,
+ int no_of_demods, u8 default_addr,
+ struct dib3000mc_config cfg[])
+{
+ printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
+ return -ENODEV;
+}
+
+static inline
+struct i2c_adapter *dib3000mc_get_tuner_i2c_master(struct dvb_frontend *demod,
+ int gating)
{
printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
return NULL;
}
#endif // CONFIG_DVB_DIB3000MC
-
-extern int dib3000mc_i2c_enumeration(struct i2c_adapter *i2c, int
no_of_demods, u8 default_addr, struct dib3000mc_config cfg[]);
-
-extern struct i2c_adapter * dib3000mc_get_tuner_i2c_master(struct dvb_frontend
*demod, int gating);
extern int dib3000mc_pid_control(struct dvb_frontend *fe, int index, int
pid,int onoff);
extern int dib3000mc_pid_parse(struct dvb_frontend *fe, int onoff);
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/50aef6cce25b1cc1e2b795aafc6abc1016169003
_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
