Pull bugzilla-8768 into release branch

[linux-2.6] / drivers / misc / Kconfig

diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 29bc1105d1bae3d45703bce04eb080a72912019c..518d5d33546489e2d4de6fca87e5a9983ce05fb0 100644 (file)
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -2,15 +2,15 @@
 # Misc strange devices
 #
 
-menuconfig MISC_STRANGE_DEV
+menuconfig MISC_DEVICES
        bool "Misc devices"
        default y
 
-if MISC_STRANGE_DEV
+if MISC_DEVICES
 
 config IBM_ASM
        tristate "Device driver for IBM RSA service processor"
-       depends on X86 && PCI && EXPERIMENTAL
+       depends on X86 && PCI && INPUT && EXPERIMENTAL
        ---help---
          This option enables device driver support for in-band access to the
          IBM RSA (Condor) service processor in eServer xSeries systems.
@@ -150,6 +150,7 @@ config THINKPAD_ACPI
        depends on X86 && ACPI
        select BACKLIGHT_CLASS_DEVICE
        select HWMON
+       select NVRAM
        ---help---
          This is a driver for the IBM and Lenovo ThinkPad laptops. It adds
          support for Fn-Fx key combinations, Bluetooth control, video
@@ -196,4 +197,25 @@ config THINKPAD_ACPI_BAY
 
          If you are not sure, say Y here.
 
-endif # MISC_STRANGE_DEV
+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