diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-11-06 22:52:29 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-11-06 22:52:29 -0500 |
| commit | 846cf85e7137320ea59c29353071f9cdd97b92bc (patch) | |
| tree | 86df8df80f790645c098dd9701f6b02f178c9d2a /drivers/media/dvb/dvb-usb/Kconfig | |
| parent | 64651309a1f0de3da131c8dc1d279c932fa979c7 (diff) | |
| parent | c5dec9fb248e3318f30a26f9984b3b064053a77f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
V4L/DVB (4751): Fix DBV_FE_CUSTOMISE for card drivers compiled into kernel
V4L/DVB (4784): [saa7146_i2c] short_delay mode fixed for fast machines
V4L/DVB (4770): Fix mode switch of Compro Videomate T300
V4L/DVB (4787): Budget-ci: Inversion setting fixed for Technotrend 1500 T
V4L/DVB (4786): Pvrusb2: use NULL instead of 0
V4L/DVB (4785): Budget-ci: Change DEBIADDR_IR to a safer default
V4L/DVB (4752): DVB: Add DVB_FE_CUSTOMISE support for MT2060
Diffstat (limited to 'drivers/media/dvb/dvb-usb/Kconfig')
| -rw-r--r-- | drivers/media/dvb/dvb-usb/Kconfig | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/media/dvb/dvb-usb/Kconfig b/drivers/media/dvb/dvb-usb/Kconfig index 2cc5caa26a0a..a263b3f3c21d 100644 --- a/drivers/media/dvb/dvb-usb/Kconfig +++ b/drivers/media/dvb/dvb-usb/Kconfig | |||
| @@ -26,7 +26,7 @@ config DVB_USB_A800 | |||
| 26 | tristate "AVerMedia AverTV DVB-T USB 2.0 (A800)" | 26 | tristate "AVerMedia AverTV DVB-T USB 2.0 (A800)" |
| 27 | depends on DVB_USB | 27 | depends on DVB_USB |
| 28 | select DVB_DIB3000MC | 28 | select DVB_DIB3000MC |
| 29 | select DVB_TUNER_MT2060 | 29 | select DVB_TUNER_MT2060 if !DVB_FE_CUSTOMISE |
| 30 | help | 30 | help |
| 31 | Say Y here to support the AVerMedia AverTV DVB-T USB 2.0 (A800) receiver. | 31 | Say Y here to support the AVerMedia AverTV DVB-T USB 2.0 (A800) receiver. |
| 32 | 32 | ||
| @@ -34,7 +34,7 @@ config DVB_USB_DIBUSB_MB | |||
| 34 | tristate "DiBcom USB DVB-T devices (based on the DiB3000M-B) (see help for device list)" | 34 | tristate "DiBcom USB DVB-T devices (based on the DiB3000M-B) (see help for device list)" |
| 35 | depends on DVB_USB | 35 | depends on DVB_USB |
| 36 | select DVB_DIB3000MB | 36 | select DVB_DIB3000MB |
| 37 | select DVB_TUNER_MT2060 | 37 | select DVB_TUNER_MT2060 if !DVB_FE_CUSTOMISE |
| 38 | help | 38 | help |
| 39 | Support for USB 1.1 and 2.0 DVB-T receivers based on reference designs made by | 39 | Support for USB 1.1 and 2.0 DVB-T receivers based on reference designs made by |
| 40 | DiBcom (<http://www.dibcom.fr>) equipped with a DiB3000M-B demodulator. | 40 | DiBcom (<http://www.dibcom.fr>) equipped with a DiB3000M-B demodulator. |
| @@ -55,7 +55,7 @@ config DVB_USB_DIBUSB_MC | |||
| 55 | tristate "DiBcom USB DVB-T devices (based on the DiB3000M-C/P) (see help for device list)" | 55 | tristate "DiBcom USB DVB-T devices (based on the DiB3000M-C/P) (see help for device list)" |
| 56 | depends on DVB_USB | 56 | depends on DVB_USB |
| 57 | select DVB_DIB3000MC | 57 | select DVB_DIB3000MC |
| 58 | select DVB_TUNER_MT2060 | 58 | select DVB_TUNER_MT2060 if !DVB_FE_CUSTOMISE |
| 59 | help | 59 | help |
| 60 | Support for USB2.0 DVB-T receivers based on reference designs made by | 60 | Support for USB2.0 DVB-T receivers based on reference designs made by |
| 61 | DiBcom (<http://www.dibcom.fr>) equipped with a DiB3000M-C/P demodulator. | 61 | DiBcom (<http://www.dibcom.fr>) equipped with a DiB3000M-C/P demodulator. |
| @@ -70,7 +70,7 @@ config DVB_USB_DIB0700 | |||
| 70 | tristate "DiBcom DiB0700 USB DVB devices (see help for supported devices)" | 70 | tristate "DiBcom DiB0700 USB DVB devices (see help for supported devices)" |
| 71 | depends on DVB_USB | 71 | depends on DVB_USB |
| 72 | select DVB_DIB3000MC | 72 | select DVB_DIB3000MC |
| 73 | select DVB_TUNER_MT2060 | 73 | select DVB_TUNER_MT2060 if !DVB_FE_CUSTOMISE |
| 74 | help | 74 | help |
| 75 | Support for USB2.0/1.1 DVB receivers based on the DiB0700 USB bridge. The | 75 | Support for USB2.0/1.1 DVB receivers based on the DiB0700 USB bridge. The |
| 76 | USB bridge is also present in devices having the DiB7700 DVB-T-USB | 76 | USB bridge is also present in devices having the DiB7700 DVB-T-USB |
| @@ -87,7 +87,7 @@ config DVB_USB_UMT_010 | |||
| 87 | tristate "HanfTek UMT-010 DVB-T USB2.0 support" | 87 | tristate "HanfTek UMT-010 DVB-T USB2.0 support" |
| 88 | depends on DVB_USB | 88 | depends on DVB_USB |
| 89 | select DVB_DIB3000MC | 89 | select DVB_DIB3000MC |
| 90 | select DVB_TUNER_MT2060 | 90 | select DVB_TUNER_MT2060 if !DVB_FE_CUSTOMISE |
| 91 | help | 91 | help |
| 92 | Say Y here to support the HanfTek UMT-010 USB2.0 stick-sized DVB-T receiver. | 92 | Say Y here to support the HanfTek UMT-010 USB2.0 stick-sized DVB-T receiver. |
| 93 | 93 | ||
| @@ -153,7 +153,7 @@ config DVB_USB_NOVA_T_USB2 | |||
| 153 | tristate "Hauppauge WinTV-NOVA-T usb2 DVB-T USB2.0 support" | 153 | tristate "Hauppauge WinTV-NOVA-T usb2 DVB-T USB2.0 support" |
| 154 | depends on DVB_USB | 154 | depends on DVB_USB |
| 155 | select DVB_DIB3000MC | 155 | select DVB_DIB3000MC |
| 156 | select DVB_TUNER_MT2060 | 156 | select DVB_TUNER_MT2060 if !DVB_FE_CUSTOMISE |
| 157 | help | 157 | help |
| 158 | Say Y here to support the Hauppauge WinTV-NOVA-T usb2 DVB-T USB2.0 receiver. | 158 | Say Y here to support the Hauppauge WinTV-NOVA-T usb2 DVB-T USB2.0 receiver. |
| 159 | 159 | ||