summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Krufky <devnull@localhost>2005-12-02 21:37:45 +0000
committerMichael Krufky <devnull@localhost>2005-12-02 21:37:45 +0000
commit6cc3aefd1d684976cbe9a51e5738c3e4ab8ed7ff (patch)
treec14a0e02fec5f680c0aec986ac3ba3c75f6cc00f
parentce248b700d20e20f26e8a01d353aece4810eb144 (diff)
downloadmediapointer-dvb-s2-6cc3aefd1d684976cbe9a51e5738c3e4ab8ed7ff.tar.gz
mediapointer-dvb-s2-6cc3aefd1d684976cbe9a51e5738c3e4ab8ed7ff.tar.bz2
fixed v4l-only build. (Build v4l modules without dvb support)
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
-rw-r--r--linux/drivers/media/video/cx88/cx88-i2c.c4
-rw-r--r--v4l/ChangeLog8
2 files changed, 11 insertions, 1 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-i2c.c b/linux/drivers/media/video/cx88/cx88-i2c.c
index c566bed34..9b7151ccf 100644
--- a/linux/drivers/media/video/cx88/cx88-i2c.c
+++ b/linux/drivers/media/video/cx88/cx88-i2c.c
@@ -1,5 +1,5 @@
/*
- $Id: cx88-i2c.c,v 1.35 2005/12/02 04:22:39 mkrufky Exp $
+ $Id: cx88-i2c.c,v 1.36 2005/12/02 21:37:45 mkrufky Exp $
cx88-i2c.c -- all the i2c code is here
@@ -141,6 +141,7 @@ void cx88_call_i2c_clients(struct cx88_core *core, unsigned int cmd, void *arg)
if (0 != core->i2c_rc)
return;
+#ifdef HAVE_VIDEO_BUF_DVB
if (core->dvbdev) {
if (core->dvbdev->dvb.frontend->ops->i2c_gate_ctrl)
core->dvbdev->dvb.frontend->ops->i2c_gate_ctrl(core->dvbdev->dvb.frontend, 1);
@@ -150,6 +151,7 @@ void cx88_call_i2c_clients(struct cx88_core *core, unsigned int cmd, void *arg)
if (core->dvbdev->dvb.frontend->ops->i2c_gate_ctrl)
core->dvbdev->dvb.frontend->ops->i2c_gate_ctrl(core->dvbdev->dvb.frontend, 0);
} else
+#endif
i2c_clients_command(&core->i2c_adap, cmd, arg);
}
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 0c4ea1f37..79f957518 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,11 @@
+2005-12-02 21:36 mkrufky
+
+ * ../linux/drivers/media/video/cx88/cx88-i2c.c:
+ (cx88_call_i2c_clients):
+ - fixed v4l-only build. (Build v4l modules without dvb support)
+
+ Signed-off-by: Michael Krufky <mkrufky@m1k.net>
+
2005-12-02 20:06 hverkuil
* ../linux/drivers/media/video/em28xx/em28xx-video.c: