Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6

[linux-2.6] / drivers / media / dvb / dvb-usb / Kconfig

diff --git a/drivers/media/dvb/dvb-usb/Kconfig b/drivers/media/dvb/dvb-usb/Kconfig
index d9f13adc87a8138d7f2fd261881631888070195b..67cefdd2334a5d31ec486f9e1cf996b70acc0852 100644 (file)
--- a/drivers/media/dvb/dvb-usb/Kconfig
+++ b/drivers/media/dvb/dvb-usb/Kconfig
@@ -26,6 +26,7 @@ config DVB_USB_A800
        tristate "AVerMedia AverTV DVB-T USB 2.0 (A800)"
        depends on DVB_USB
        select DVB_DIB3000MC
+       select DVB_TUNER_MT2060
        help
          Say Y here to support the AVerMedia AverTV DVB-T USB 2.0 (A800) receiver.
 
@@ -33,24 +34,13 @@ config DVB_USB_DIBUSB_MB
        tristate "DiBcom USB DVB-T devices (based on the DiB3000M-B) (see help for device list)"
        depends on DVB_USB
        select DVB_DIB3000MB
+       select DVB_TUNER_MT2060
        help
          Support for USB 1.1 and 2.0 DVB-T receivers based on reference designs made by
          DiBcom (<http://www.dibcom.fr>) equipped with a DiB3000M-B demodulator.
 
-         Devices supported by this driver:
-           Artec T1 USB1.1 boxes
-           Avermedia AverTV DVBT USB1.1
-           Compro Videomate DVB-U2000 - DVB-T USB
-           DiBcom USB1.1 reference devices (non-public)
-           Grandtec DVB-T USB
-           Hama DVB-T USB1.1-Box
-           KWorld/JetWay/ADSTech V-Stream XPERT DTV - DVB-T USB1.1 and USB2.0
-           TwinhanDTV Magic Box (VP7041e)
-           TwinhanDTV USB-Ter (VP7041)
-           Ultima Electronic/Artec T1 USB TVBOX
-
-         The VP7041 seems to be identical to "CTS Portable" (Chinese
-         Television System).
+         For an up-to-date list of devices supported by this driver, have a look
+         on the Linux-DVB Wiki at www.linuxtv.org.
 
          Say Y if you own such a device and want to use it. You should build it as
          a module.
@@ -65,13 +55,31 @@ 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_TUNER_MT2060
        help
-         Support for 2.0 DVB-T receivers based on reference designs made by
+         Support for USB2.0 DVB-T receivers based on reference designs made by
          DiBcom (<http://www.dibcom.fr>) equipped with a DiB3000M-C/P demodulator.
 
-         Devices supported by this driver:
-           Artec T1 USB2.0 boxes
-           DiBcom USB2.0 reference devices (non-public)
+         For an up-to-date list of devices supported by this driver, have a look
+         on the Linux-DVB Wiki at www.linuxtv.org.
+
+         Say Y if you own such a device and want to use it. You should build it as
+         a module.
+
+config DVB_USB_DIB0700
+       tristate "DiBcom DiB0700 USB DVB devices (see help for supported devices)"
+       depends on DVB_USB
+       select DVB_DIB7000M
+       select DVB_DIB3000MC
+       select DVB_TUNER_MT2060
+       help
+         Support for USB2.0/1.1 DVB receivers based on the DiB0700 USB bridge. The
+         USB bridge is also present in devices having the DiB7700 DVB-T-USB
+         silicon. This chip can be found in devices offered by Hauppauge,
+         Avermedia and other big and small companies.
+
+         For an up-to-date list of devices supported by this driver, have a look
+         on the Linux-DVB Wiki at www.linuxtv.org.
 
          Say Y if you own such a device and want to use it. You should build it as
          a module.
@@ -80,6 +88,7 @@ config DVB_USB_UMT_010
        tristate "HanfTek UMT-010 DVB-T USB2.0 support"
        depends on DVB_USB
        select DVB_DIB3000MC
+       select DVB_TUNER_MT2060
        help
          Say Y here to support the HanfTek UMT-010 USB2.0 stick-sized DVB-T receiver.
 
@@ -145,6 +154,7 @@ 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_TUNER_MT2060
        help
          Say Y here to support the Hauppauge WinTV-NOVA-T usb2 DVB-T USB2.0 receiver.