aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/drivers/media/usb/cx231xx
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab+huawei@kernel.org>2020-04-14 11:00:30 +0200
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>2020-04-14 11:00:30 +0200
commit85f7cd3a2aadd3be9652ce105370f561ff755a26 (patch)
tree0e1ad20b3b68d99cf2ebc88ae900a98a71fdf0a5 /drivers/media/usb/cx231xx
parentmedia: docs: get rid of Documentation/media/ (diff)
downloadwireguard-linux-85f7cd3a2aadd3be9652ce105370f561ff755a26.tar.xz
wireguard-linux-85f7cd3a2aadd3be9652ce105370f561ff755a26.zip
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/usb/cx231xx')
-rw-r--r--drivers/media/usb/cx231xx/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/usb/cx231xx/Kconfig b/drivers/media/usb/cx231xx/Kconfig
index 7e3b189f9dca..2fe2b2d335ba 100644
--- a/drivers/media/usb/cx231xx/Kconfig
+++ b/drivers/media/usb/cx231xx/Kconfig
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-only
config VIDEO_CX231XX
tristate "Conexant cx231xx USB video capture support"
- depends on I2C && I2C_MUX
+ depends on VIDEO_DEV && I2C && I2C_MUX
select VIDEO_TUNER
select VIDEO_TVEEPROM
select VIDEOBUF2_VMALLOC
@@ -40,7 +40,7 @@ config VIDEO_CX231XX_ALSA
config VIDEO_CX231XX_DVB
tristate "DVB/ATSC Support for Cx231xx based TV cards"
- depends on VIDEO_CX231XX
+ depends on VIDEO_CX231XX && DVB_CORE
select MEDIA_TUNER_XC5000 if MEDIA_SUBDRV_AUTOSELECT
select MEDIA_TUNER_TDA18271 if MEDIA_SUBDRV_AUTOSELECT
select DVB_MB86A20S if MEDIA_SUBDRV_AUTOSELECT