diff options
| author |   Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2020-04-14 11:00:30 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2020-04-14 11:00:30 +0200 |
| commit | 85f7cd3a2aadd3be9652ce105370f561ff755a26 (patch) | |
| tree | 0e1ad20b3b68d99cf2ebc88ae900a98a71fdf0a5 /drivers/media/usb/Kconfig | |
| parent | media: docs: get rid of Documentation/media/ (diff) | |
| download | linux-dev-85f7cd3a2aadd3be9652ce105370f561ff755a26.tar.xz linux-dev-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/Kconfig')
| -rw-r--r-- | drivers/media/usb/Kconfig | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/media/usb/Kconfig b/drivers/media/usb/Kconfig index 036aa4385fdc..bf08393e38d1 100644 --- a/drivers/media/usb/Kconfig +++ b/drivers/media/usb/Kconfig @@ -5,12 +5,6 @@ config TTPCI_EEPROM tristate depends on I2C -# Should match the hybrid card list below -config MEDIA_HYBRID_USB - bool - depends on VIDEO_AU0828 || VIDEO_CX231XX || VIDEO_TM6000 || VIDEO_PVRUSB2 - default y - if USB && MEDIA_SUPPORT menuconfig MEDIA_USB_SUPPORT @@ -35,6 +29,7 @@ endif if MEDIA_ANALOG_TV_SUPPORT comment "Analog TV USB devices" +source "drivers/media/usb/pvrusb2/Kconfig" source "drivers/media/usb/hdpvr/Kconfig" source "drivers/media/usb/stk1160/Kconfig" source "drivers/media/usb/go7007/Kconfig" @@ -44,7 +39,6 @@ if (MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT) comment "Analog/digital TV USB devices" source "drivers/media/usb/au0828/Kconfig" source "drivers/media/usb/cx231xx/Kconfig" -source "drivers/media/usb/pvrusb2/Kconfig" source "drivers/media/usb/tm6000/Kconfig" endif |