Merge branch 'for-upstream/platform-x86_tpacpi' of git://repo.or.cz/linux-2.6/linux...

[linux-2.6.git] / drivers / platform / x86 / Kconfig

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index aef4f17cdfd471c6ae8fa521f1d293f17817e69d..92161c7ff4b7b2b67fa193b63320fa7e902dc03f 100644 (file)
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -322,9 +322,15 @@ config THINKPAD_ACPI_VIDEO
          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.
+         don't think twice: do it and say N here to save memory and avoid
+         bad interactions with X.org.
 
-         If you are not sure, say Y here.
+         NOTE: access to this feature is limited to processes with the
+         CAP_SYS_ADMIN capability, to avoid local DoS issues in platforms
+         where it interacts badly with X.org.
+
+         If you are not sure, say Y here but do try to check if you could
+         be using X.org RandR instead.
 
 config THINKPAD_ACPI_HOTKEY_POLL
        bool "Support NVRAM polling for hot keys"