summaryrefslogtreecommitdiff
path: root/drivers/media/pci/cx23885
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab+huawei@kernel.org>2020-04-14 12:00:30 +0300
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>2020-04-14 12:00:30 +0300
commit85f7cd3a2aadd3be9652ce105370f561ff755a26 (patch)
tree0e1ad20b3b68d99cf2ebc88ae900a98a71fdf0a5 /drivers/media/pci/cx23885
parentd29e1ef4d638a6be59a8859b4994b457bb7348c5 (diff)
downloadlinux-85f7cd3a2aadd3be9652ce105370f561ff755a26.tar.xz
Revert "media: Kconfig: better support hybrid TV devices"
Changing from "depends on" to "select" may cause some side-effects. This patch is not ready to be merged yet, as it requires some adjustments. So, let's revert it. This reverts commit a3b91d8bd1e034c8ed89d3f55243478af97a0a52. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Diffstat (limited to 'drivers/media/pci/cx23885')
-rw-r--r--drivers/media/pci/cx23885/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/pci/cx23885/Kconfig b/drivers/media/pci/cx23885/Kconfig
index e8f4edf270c8..926da881929d 100644
--- a/drivers/media/pci/cx23885/Kconfig
+++ b/drivers/media/pci/cx23885/Kconfig
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-only
config VIDEO_CX23885
tristate "Conexant cx23885 (2388x successor) support"
- depends on PCI && I2C && INPUT && SND
+ depends on DVB_CORE && VIDEO_DEV && PCI && I2C && INPUT && SND
select SND_PCM
select I2C_ALGOBIT
select VIDEO_TUNER
@@ -53,7 +53,7 @@ config VIDEO_CX23885
config MEDIA_ALTERA_CI
tristate "Altera FPGA based CI module"
- depends on VIDEO_CX23885
+ depends on VIDEO_CX23885 && DVB_CORE
select ALTERA_STAPL
help
An Altera FPGA CI module for NetUP Dual DVB-T/C RF CI card.