The patch number 10898 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 dib7000m
Priority: normal
Signed-off-by: Michael Krufky <[email protected]>
---
linux/drivers/media/dvb/frontends/dib7000m.h | 20 +++++++++++++++++++
1 file changed, 20 insertions(+)
diff -r 91f9c6c451f7 -r 7188c9ab48ce
linux/drivers/media/dvb/frontends/dib7000m.h
--- a/linux/drivers/media/dvb/frontends/dib7000m.h Mon Mar 02 09:39:13
2009 -0300
+++ b/linux/drivers/media/dvb/frontends/dib7000m.h Sun Mar 08 23:03:25
2009 -0400
@@ -38,8 +38,28 @@ struct dib7000m_config {
#define DEFAULT_DIB7000M_I2C_ADDRESS 18
+#if defined(CONFIG_DVB_DIB7000M) || (defined(CONFIG_DVB_DIB7000M_MODULE) && \
+ defined(MODULE))
extern struct dvb_frontend * dib7000m_attach(struct i2c_adapter *i2c_adap, u8
i2c_addr, struct dib7000m_config *cfg);
extern struct i2c_adapter * dib7000m_get_i2c_master(struct dvb_frontend *,
enum dibx000_i2c_interface, int);
+#else
+static inline
+struct dvb_frontend *dib7000m_attach(struct i2c_adapter *i2c_adap,
+ u8 i2c_addr, struct dib7000m_config *cfg)
+{
+ printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
+ return NULL;
+}
+
+static inline
+struct i2c_adapter *dib7000m_get_i2c_master(struct dvb_frontend *demod,
+ enum dibx000_i2c_interface intf,
+ int gating)
+{
+ printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
+ return NULL;
+}
+#endif
/* TODO
extern INT dib7000m_set_gpio(struct dibDemod *demod, UCHAR num, UCHAR dir,
UCHAR val);
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/7188c9ab48ce5c39219f3b02cda0ca9b1474a7fe
_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
