diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-12 06:39:21 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-12 06:39:21 -0500 |
| commit | 708b8eae0fd532af73ea8350e6dcc10255ff7376 (patch) | |
| tree | f336436934fd79bc91aff7112a9beb10bc4e839f /drivers/media/dvb/dvb-usb/Kconfig | |
| parent | d98d38f2014ab79f28c126ff175d034891f7aefc (diff) | |
| parent | f21f237cf55494c3a4209de323281a3b0528da10 (diff) | |
Merge branch 'linus' into core/locking
Diffstat (limited to 'drivers/media/dvb/dvb-usb/Kconfig')
| -rw-r--r-- | drivers/media/dvb/dvb-usb/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/dvb/dvb-usb/Kconfig b/drivers/media/dvb/dvb-usb/Kconfig index 3c13bcfa6385..62b68c291d99 100644 --- a/drivers/media/dvb/dvb-usb/Kconfig +++ b/drivers/media/dvb/dvb-usb/Kconfig | |||
| @@ -261,7 +261,7 @@ config DVB_USB_DW2102 | |||
| 261 | Say Y here to support the DvbWorld DVB-S/S2 USB2.0 receivers | 261 | Say Y here to support the DvbWorld DVB-S/S2 USB2.0 receivers |
| 262 | and the TeVii S650. | 262 | and the TeVii S650. |
| 263 | 263 | ||
| 264 | config DVB_USB_CINERGY_T2 | 264 | config DVB_USB_CINERGY_T2 |
| 265 | tristate "Terratec CinergyT2/qanu USB 2.0 DVB-T receiver" | 265 | tristate "Terratec CinergyT2/qanu USB 2.0 DVB-T receiver" |
| 266 | depends on DVB_USB | 266 | depends on DVB_USB |
| 267 | help | 267 | help |
| @@ -283,6 +283,7 @@ config DVB_USB_ANYSEE | |||
| 283 | config DVB_USB_DTV5100 | 283 | config DVB_USB_DTV5100 |
| 284 | tristate "AME DTV-5100 USB2.0 DVB-T support" | 284 | tristate "AME DTV-5100 USB2.0 DVB-T support" |
| 285 | depends on DVB_USB | 285 | depends on DVB_USB |
| 286 | select DVB_ZL10353 if !DVB_FE_CUSTOMISE | ||
| 286 | select MEDIA_TUNER_QT1010 if !DVB_FE_CUSTOMISE | 287 | select MEDIA_TUNER_QT1010 if !DVB_FE_CUSTOMISE |
| 287 | help | 288 | help |
| 288 | Say Y here to support the AME DTV-5100 USB2.0 DVB-T receiver. | 289 | Say Y here to support the AME DTV-5100 USB2.0 DVB-T receiver. |