diff options
author | Darron Broad <darron@kewl.org> | 2008-10-21 09:42:00 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-21 12:31:55 -0400 |
commit | 9212a572dd5ecc69f9b9985ba3e92c6f2504f0fc (patch) | |
tree | a819dd81898088fa008b58e2a05aee9808d4eb86 /drivers/media/video/cx88/cx88-mpeg.c | |
parent | 8a522c916d3c3b29a38bd3c8fc3df826d22a9444 (diff) |
V4L/DVB (9332): cx88: initial fix for analogue only compilation
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>
Diffstat (limited to 'drivers/media/video/cx88/cx88-mpeg.c')
-rw-r--r-- | drivers/media/video/cx88/cx88-mpeg.c | 7 |
1 files changed, 6 insertions, 1 deletions
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, | |||
768 | { | 768 | { |
769 | struct cx8802_dev *dev; | 769 | struct cx8802_dev *dev; |
770 | struct cx88_core *core; | 770 | struct cx88_core *core; |
771 | int err; | ||
772 | #if defined(CONFIG_VIDEO_CX88_DVB) || defined(CONFIG_VIDEO_CX88_DVB_MODULE) | ||
771 | struct videobuf_dvb_frontend *demod; | 773 | struct videobuf_dvb_frontend *demod; |
772 | int err,i; | 774 | int i; |
775 | #endif | ||
773 | 776 | ||
774 | /* general setup */ | 777 | /* general setup */ |
775 | core = cx88_core_get(pci_dev); | 778 | core = cx88_core_get(pci_dev); |
@@ -801,6 +804,7 @@ static int __devinit cx8802_probe(struct pci_dev *pci_dev, | |||
801 | INIT_LIST_HEAD(&dev->drvlist); | 804 | INIT_LIST_HEAD(&dev->drvlist); |
802 | list_add_tail(&dev->devlist,&cx8802_devlist); | 805 | list_add_tail(&dev->devlist,&cx8802_devlist); |
803 | 806 | ||
807 | #if defined(CONFIG_VIDEO_CX88_DVB) || defined(CONFIG_VIDEO_CX88_DVB_MODULE) | ||
804 | mutex_init(&dev->frontends.lock); | 808 | mutex_init(&dev->frontends.lock); |
805 | INIT_LIST_HEAD(&dev->frontends.felist); | 809 | INIT_LIST_HEAD(&dev->frontends.felist); |
806 | 810 | ||
@@ -814,6 +818,7 @@ static int __devinit cx8802_probe(struct pci_dev *pci_dev, | |||
814 | goto fail_free; | 818 | goto fail_free; |
815 | } | 819 | } |
816 | } | 820 | } |
821 | #endif | ||
817 | 822 | ||
818 | /* Maintain a reference so cx88-video can query the 8802 device. */ | 823 | /* Maintain a reference so cx88-video can query the 8802 device. */ |
819 | core->dvbdev = dev; | 824 | core->dvbdev = dev; |