Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

[linux-2.6-omap-h63xx.git] / drivers / misc / Kconfig

diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 518d5d33546489e2d4de6fca87e5a9983ce05fb0..73e248fb2ff190ba0ecac84e3ac849d531c08bb1 100644 (file)
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -5,6 +5,11 @@
 menuconfig MISC_DEVICES
        bool "Misc devices"
        default y
+       ---help---
+         Say Y here to get to see options for device drivers from various
+         different categories. This option alone does not add any kernel code.
+
+         If you say N, all options in this submenu will be skipped and disabled.
 
 if MISC_DEVICES
 
@@ -197,25 +202,5 @@ config THINKPAD_ACPI_BAY
 
          If you are not sure, say Y here.
 
-config THINKPAD_ACPI_INPUT_ENABLED
-       bool "Enable input layer support by default"
-       depends on THINKPAD_ACPI
-       default n
-       ---help---
-         This option enables thinkpad-acpi hot key handling over the input
-         layer at driver load time.  When it is unset, the driver does not
-         enable hot key handling by default, and also starts up with a mostly
-         empty keymap.
-
-         This option should be enabled if you have a new enough HAL or other
-         userspace support that properly handles the thinkpad-acpi event
-         device.  It auto-tunes the hot key support to those reported by the
-         firmware and enables it automatically.
-
-         If unsure, say N here to retain the old behaviour of ibm-acpi, and
-         thinkpad-acpi up to kernel 2.6.21: userspace will have to enable and
-         set up the thinkpad-acpi hot key handling using the sysfs interace
-         after loading the driver.
-
 
 endif # MISC_DEVICES