[media] dvb-usb: avoid link error with dib3000m{b,c|

[cascardo/linux.git] / drivers / media / usb / dvb-usb / Kconfig

diff --git a/drivers/media/usb/dvb-usb/Kconfig b/drivers/media/usb/dvb-usb/Kconfig
index f03b0b7..959fa09 100644 (file)
--- a/drivers/media/usb/dvb-usb/Kconfig
+++ b/drivers/media/usb/dvb-usb/Kconfig
@@ -20,10 +20,20 @@ config DVB_USB_DEBUG
          Say Y if you want to enable debugging. See modinfo dvb-usb (and the
          appropriate drivers) for debug levels.
 
+config DVB_USB_DIB3000MC
+       tristate
+       depends on DVB_USB
+       select DVB_DIB3000MC
+       help
+         This is a module with helper functions for accessing the
+         DIB3000MC from USB DVB devices. It must be a separate module
+         in case DVB_USB is built-in and DVB_DIB3000MC is a module,
+         and gets selected automatically when needed.
+
 config DVB_USB_A800
        tristate "AVerMedia AverTV DVB-T USB 2.0 (A800)"
        depends on DVB_USB
-       select DVB_DIB3000MC
+       select DVB_USB_DIB3000MC
        select DVB_PLL if MEDIA_SUBDRV_AUTOSELECT
        select MEDIA_TUNER_MT2060 if MEDIA_SUBDRV_AUTOSELECT
        help
@@ -34,6 +44,7 @@ config DVB_USB_DIBUSB_MB
        depends on DVB_USB
        select DVB_PLL if MEDIA_SUBDRV_AUTOSELECT
        select DVB_DIB3000MB
+       depends on DVB_DIB3000MC || !DVB_DIB3000MC
        select MEDIA_TUNER_MT2060 if MEDIA_SUBDRV_AUTOSELECT
        help
          Support for USB 1.1 and 2.0 DVB-T receivers based on reference designs made by
@@ -54,7 +65,7 @@ config DVB_USB_DIBUSB_MB_FAULTY
 config DVB_USB_DIBUSB_MC
        tristate "DiBcom USB DVB-T devices (based on the DiB3000M-C/P) (see help for device list)"
        depends on DVB_USB
-       select DVB_DIB3000MC
+       select DVB_USB_DIB3000MC
        select MEDIA_TUNER_MT2060 if MEDIA_SUBDRV_AUTOSELECT
        help
          Support for USB2.0 DVB-T receivers based on reference designs made by
@@ -72,7 +83,7 @@ config DVB_USB_DIB0700
        select DVB_DIB7000P if MEDIA_SUBDRV_AUTOSELECT
        select DVB_DIB7000M if MEDIA_SUBDRV_AUTOSELECT
        select DVB_DIB8000 if MEDIA_SUBDRV_AUTOSELECT
-       select DVB_DIB3000MC if MEDIA_SUBDRV_AUTOSELECT
+       select DVB_USB_DIB3000MC if MEDIA_SUBDRV_AUTOSELECT
        select DVB_S5H1411 if MEDIA_SUBDRV_AUTOSELECT
        select DVB_LGDT3305 if MEDIA_SUBDRV_AUTOSELECT
        select DVB_TUNER_DIB0070 if MEDIA_SUBDRV_AUTOSELECT
@@ -99,7 +110,7 @@ config DVB_USB_UMT_010
        tristate "HanfTek UMT-010 DVB-T USB2.0 support"
        depends on DVB_USB
        select DVB_PLL if MEDIA_SUBDRV_AUTOSELECT
-       select DVB_DIB3000MC
+       select DVB_USB_DIB3000MC
        select MEDIA_TUNER_MT2060 if MEDIA_SUBDRV_AUTOSELECT
        select DVB_MT352 if MEDIA_SUBDRV_AUTOSELECT
        help
@@ -192,7 +203,7 @@ config DVB_USB_GP8PSK
 config DVB_USB_NOVA_T_USB2
        tristate "Hauppauge WinTV-NOVA-T usb2 DVB-T USB2.0 support"
        depends on DVB_USB
-       select DVB_DIB3000MC
+       select DVB_USB_DIB3000MC
        select DVB_PLL if MEDIA_SUBDRV_AUTOSELECT
        select MEDIA_TUNER_MT2060 if MEDIA_SUBDRV_AUTOSELECT
        help