The patch number 9332 was added via [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:
[EMAIL PROTECTED]
------
From: Darron Broad <[EMAIL PROTECTED]>
cx88: initial fix for analogue only compilation
Initial fix for when analogue only is selected
for compilation (ie, !CX88_DVB)
Priority: normal
Signed-off-by: Darron Broad <[EMAIL PROTECTED]>
---
linux/drivers/media/video/cx88/cx88-i2c.c | 2 ++
linux/drivers/media/video/cx88/cx88-mpeg.c | 7 ++++++-
2 files changed, 8 insertions(+), 1 deletion(-)
diff -r 4f18c6f61ded -r 658cab218802 linux/drivers/media/video/cx88/cx88-i2c.c
--- a/linux/drivers/media/video/cx88/cx88-i2c.c Sun Oct 19 23:58:26 2008 +0200
+++ b/linux/drivers/media/video/cx88/cx88-i2c.c Tue Oct 21 14:42:00 2008 +0100
@@ -116,8 +116,10 @@ static int detach_inform(struct i2c_clie
void cx88_call_i2c_clients(struct cx88_core *core, unsigned int cmd, void *arg)
{
+#if defined(CONFIG_VIDEO_CX88_DVB) || defined(CONFIG_VIDEO_CX88_DVB_MODULE)
struct videobuf_dvb_frontends *f = &core->dvbdev->frontends;
struct videobuf_dvb_frontend *fe = NULL;
+#endif
if (0 != core->i2c_rc)
return;
diff -r 4f18c6f61ded -r 658cab218802 linux/drivers/media/video/cx88/cx88-mpeg.c
--- a/linux/drivers/media/video/cx88/cx88-mpeg.c Sun Oct 19 23:58:26
2008 +0200
+++ b/linux/drivers/media/video/cx88/cx88-mpeg.c Tue Oct 21 14:42:00
2008 +0100
@@ -808,8 +808,11 @@ static int __devinit cx8802_probe(struct
{
struct cx8802_dev *dev;
struct cx88_core *core;
+ int err;
+#if defined(CONFIG_VIDEO_CX88_DVB) || defined(CONFIG_VIDEO_CX88_DVB_MODULE)
struct videobuf_dvb_frontend *demod;
- int err,i;
+ int i;
+#endif
/* general setup */
core = cx88_core_get(pci_dev);
@@ -841,6 +844,7 @@ static int __devinit cx8802_probe(struct
INIT_LIST_HEAD(&dev->drvlist);
list_add_tail(&dev->devlist,&cx8802_devlist);
+#if defined(CONFIG_VIDEO_CX88_DVB) || defined(CONFIG_VIDEO_CX88_DVB_MODULE)
mutex_init(&dev->frontends.lock);
INIT_LIST_HEAD(&dev->frontends.felist);
@@ -854,6 +858,7 @@ static int __devinit cx8802_probe(struct
goto fail_free;
}
}
+#endif
/* Maintain a reference so cx88-video can query the 8802 device. */
core->dvbdev = dev;
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/658cab218802089cd6d12c82b2bec53c36b6aeb1
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
