Merge branch 'x86/setup' into x86/devel

[linux-2.6-omap-h63xx.git] / drivers / media / dvb / cinergyT2 / Kconfig

diff --git a/drivers/media/dvb/cinergyT2/Kconfig b/drivers/media/dvb/cinergyT2/Kconfig
index 6018fcdba1e6dc6ec02fa9a61d1a742c6b2bca71..c03513b2ccaee79b34bc85fbff88e81028011bc7 100644 (file)
--- a/drivers/media/dvb/cinergyT2/Kconfig
+++ b/drivers/media/dvb/cinergyT2/Kconfig
@@ -1,6 +1,6 @@
 config DVB_CINERGYT2
        tristate "Terratec CinergyT2/qanu USB2 DVB-T receiver"
-       depends on DVB_CORE && USB
+       depends on DVB_CORE && USB && INPUT
        help
          Support for "TerraTec CinergyT2" USB2.0 Highspeed DVB Receivers
 
@@ -56,7 +56,7 @@ config DVB_CINERGYT2_QUERY_INTERVAL
          measurements.
 
          Please keep in mind that these updates cause traffic on the tuner
-         control bus and thus may or may not affect receiption sensitivity.
+         control bus and thus may or may not affect reception sensitivity.
 
          The default value should be a safe choice for common applications.
 
@@ -64,7 +64,7 @@ config DVB_CINERGYT2_QUERY_INTERVAL
 config DVB_CINERGYT2_ENABLE_RC_INPUT_DEVICE
        bool "Register the onboard IR Remote Control Receiver as Input Device"
        depends on DVB_CINERGYT2_TUNING
-       default "yes"
+       default y
        help
          Enable this option if you want to use the onboard Infrared Remote
          Control Receiver as Linux-Input device.