]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
V4L/DVB (9332): cx88: initial fix for analogue only compilation
authorDarron Broad <darron@kewl.org>
Tue, 21 Oct 2008 13:42:00 +0000 (10:42 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Tue, 21 Oct 2008 16:31:55 +0000 (14:31 -0200)
Initial fix for when analogue only is selected
for compilation (ie, !CX88_DVB)

Signed-off-by: Darron Broad <darron@kewl.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/cx88/cx88-i2c.c
drivers/media/video/cx88/cx88-mpeg.c

index 01de23007095f5d7d1de4b8371df34f26b9d0795..1ab691d2069268dc6d2db42ac0b304eef1f69288 100644 (file)
@@ -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;
 
index 6df5cf31418627025e16752fdecbab998040a7ed..b21fd93c1929839247e1fd57e3a8a1e0b0744591 100644 (file)
@@ -768,8 +768,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);
@@ -801,6 +804,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);
 
@@ -814,6 +818,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;