Merge branches 'for-4.11/upstream-fixes', 'for-4.12/accutouch', 'for-4.12/cp2112...

[mirror_ubuntu-bionic-kernel.git] / drivers / media / usb / dvb-usb-v2 / Kconfig

diff --git a/drivers/media/usb/dvb-usb-v2/Kconfig b/drivers/media/usb/dvb-usb-v2/Kconfig
index 524533d3eb291c7f22b5c131ab7479b134031428..0e4944b2b0f4d3a70eec4a0958f4ecccf1ea3803 100644 (file)
--- a/drivers/media/usb/dvb-usb-v2/Kconfig
+++ b/drivers/media/usb/dvb-usb-v2/Kconfig
@@ -156,3 +156,11 @@ config DVB_USB_DVBSKY
        select DVB_SP2 if MEDIA_SUBDRV_AUTOSELECT
        help
          Say Y here to support the USB receivers from DVBSky.
+
+config DVB_USB_ZD1301
+       tristate "ZyDAS ZD1301"
+       depends on DVB_USB_V2
+       select DVB_ZD1301_DEMOD if MEDIA_SUBDRV_AUTOSELECT
+       select MEDIA_TUNER_MT2060 if MEDIA_SUBDRV_AUTOSELECT
+       help
+         Say Y here to support the ZyDAS ZD1301 DVB USB receiver.