2 files changed, 8 insertions, 1 deletions

diff --git a/drivers/media/video/cx88/cx88-i2c.c b/drivers/media/video/cx88/cx88-i2c.c
index 01de23007095..1ab691d20692 100644
--- a/drivers/media/video/cx88/cx88-i2c.c
+++ b/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/drivers/media/video/cx88/cx88-mpeg.c b/drivers/media/video/cx88/cx88-mpeg.c
index 6df5cf314186..b21fd93c1929 100644
--- a/drivers/media/video/cx88/cx88-mpeg.c
+++ b/drivers/media/video/cx88/cx88-mpeg.c
@@ -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;