Merge branch 'merge-fixes' into devel

[~andy/linux] / drivers / misc / Kconfig

diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index c143a86c2ea6f03b6379220a20e04d254ecc54be..962817e49fba02e063dc164a3d0971e221eaa3a7 100644 (file)
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -108,12 +108,16 @@ config ACER_WMI
        depends on ACPI
        depends on LEDS_CLASS
        depends on BACKLIGHT_CLASS_DEVICE
+       depends on SERIO_I8042
        select ACPI_WMI
        ---help---
          This is a driver for newer Acer (and Wistron) laptops. It adds
          wireless radio and bluetooth control, and on some laptops,
          exposes the mail LED and LCD backlight.
 
+         For more information about this driver see
+         <file:Documentation/laptops/acer-wmi.txt>
+
          If you have an ACPI-WMI compatible Acer/ Wistron laptop, say Y or M
          here.
 
@@ -152,8 +156,9 @@ config FUJITSU_LAPTOP
          If you have a Fujitsu laptop, say Y or M here.
 
 config TC1100_WMI
-       tristate "HP Compaq TC1100 Tablet WMI Extras"
+       tristate "HP Compaq TC1100 Tablet WMI Extras (EXPERIMENTAL)"
        depends on X86 && !X86_64
+       depends on EXPERIMENTAL
        depends on ACPI
        select ACPI_WMI
        ---help---
@@ -192,7 +197,7 @@ config SONY_LAPTOP
          screen brightness control, Fn keys and allows powering on/off some
          devices.
 
-         Read <file:Documentation/sony-laptop.txt> for more information.
+         Read <file:Documentation/laptops/sony-laptop.txt> for more information.
 
 config SONYPI_COMPAT
        bool "Sonypi compatibility"
@@ -211,8 +216,9 @@ config THINKPAD_ACPI
          This is a driver for the IBM and Lenovo ThinkPad laptops. It adds
          support for Fn-Fx key combinations, Bluetooth control, video
          output switching, ThinkLight control, UltraBay eject and more.
-         For more information about this driver see 
-         <file:Documentation/thinkpad-acpi.txt> and <http://ibm-acpi.sf.net/> .
+         For more information about this driver see
+         <file:Documentation/laptops/thinkpad-acpi.txt> and
+         <http://ibm-acpi.sf.net/> .
 
          This driver was formerly known as ibm-acpi.
 
@@ -253,6 +259,23 @@ config THINKPAD_ACPI_BAY
 
          If you are not sure, say Y here.
 
+config THINKPAD_ACPI_VIDEO
+       bool "Video output control support"
+       depends on THINKPAD_ACPI
+       default y
+       ---help---
+         Allows the thinkpad_acpi driver to provide an interface to control
+         the various video output ports.
+
+         This feature often won't work well, depending on ThinkPad model,
+         display state, video output devices in use, whether there is a X
+         server running, phase of the moon, and the current mood of
+         Schroedinger's cat.  If you can use X.org's RandR to control
+         your ThinkPad's video output ports instead of this feature,
+         don't think twice: do it and say N here to save some memory.
+
+         If you are not sure, say Y here.
+
 config THINKPAD_ACPI_HOTKEY_POLL
        bool "Suport NVRAM polling for hot keys"
        depends on THINKPAD_ACPI