diff options
| author | darron@kewl.org <darron@kewl.org> | 2008-10-21 14:42:00 +0100 |
|---|---|---|
| committer | darron@kewl.org <darron@kewl.org> | 2008-10-21 14:42:00 +0100 |
| commit | 102df888ee48727bf1593559f4c301f33ecd7bab (patch) | |
| tree | a1b671c9d8c0c6155aab47a9f016902c4bd204f3 /linux/drivers | |
| parent | cb8889206ccd1bba415637cab83e4ef38fd74b1e (diff) | |
| download | mediapointer-dvb-s2-102df888ee48727bf1593559f4c301f33ecd7bab.tar.gz mediapointer-dvb-s2-102df888ee48727bf1593559f4c301f33ecd7bab.tar.bz2 | |
cx88: initial fix for analogue only compilation
From: Darron Broad <darron@kewl.org>
Initial fix for when analogue only is selected
for compilation (ie, !CX88_DVB)
Priority: normal
Signed-off-by: Darron Broad <darron@kewl.org>
Diffstat (limited to 'linux/drivers')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-i2c.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-mpeg.c | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-i2c.c b/linux/drivers/media/video/cx88/cx88-i2c.c index 01de23007..1ab691d20 100644 --- a/linux/drivers/media/video/cx88/cx88-i2c.c +++ b/linux/drivers/media/video/cx88/cx88-i2c.c @@ -116,8 +116,10 @@ static int detach_inform(struct i2c_client *client) 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 --git a/linux/drivers/media/video/cx88/cx88-mpeg.c b/linux/drivers/media/video/cx88/cx88-mpeg.c index bad3680b9..0c33ebdd6 100644 --- a/linux/drivers/media/video/cx88/cx88-mpeg.c +++ b/linux/drivers/media/video/cx88/cx88-mpeg.c @@ -808,8 +808,11 @@ static int __devinit cx8802_probe(struct pci_dev *pci_dev, { 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 pci_dev *pci_dev, 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 pci_dev *pci_dev, goto fail_free; } } +#endif /* Maintain a reference so cx88-video can query the 8802 device. */ core->dvbdev = dev; |