Pull bugzilla-8768 into release branch

[linux-2.6] / drivers / misc / Kconfig

diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index a3c525b2616aafeaa855b03377e0f4ee4937cdc5..518d5d33546489e2d4de6fca87e5a9983ce05fb0 100644 (file)
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -2,11 +2,15 @@
 # Misc strange devices
 #
 
-menu "Misc devices"
+menuconfig MISC_DEVICES
+       bool "Misc devices"
+       default y
+
+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.
@@ -25,6 +29,20 @@ config IBM_ASM
          information on the specific driver level and support statement
          for your IBM server.
 
+config PHANTOM
+       tristate "Sensable PHANToM"
+       depends on PCI
+       help
+         Say Y here if you want to build a driver for Sensable PHANToM device.
+
+         If you choose to build module, its name will be phantom. If unsure,
+         say N here.
+
+config EEPROM_93CX6
+       tristate "EEPROM 93CX6 support"
+       ---help---
+         This is a driver for the EEPROM chipsets 93c46 and 93c66.
+         The driver supports both read as well as write commands.
 
          If unsure, say N.
 
@@ -121,7 +139,7 @@ config SONY_LAPTOP
 
          Read <file:Documentation/sony-laptop.txt> for more information.
 
-config SONY_LAPTOP_OLD
+config SONYPI_COMPAT
        bool "Sonypi compatibility"
        depends on SONY_LAPTOP
          ---help---
@@ -132,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
@@ -178,4 +197,25 @@ config THINKPAD_ACPI_BAY
 
          If you are not sure, say Y here.
 
-endmenu
+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