diff options
| author | Matthew Garrett <mjg@redhat.com> | 2010-03-02 09:51:48 -0500 |
|---|---|---|
| committer | Matthew Garrett <mjg@redhat.com> | 2010-03-02 09:51:48 -0500 |
| commit | a58db59a263d4232710af816f3857254b5823633 (patch) | |
| tree | 977120471e3d34412d2c810c48d0fe2b9547ffc7 /drivers/platform/x86/Kconfig | |
| parent | 881a6c25a8453388e3190de94a5e105439a9f806 (diff) | |
| parent | 88cc83772a3c7756b9f2b4ba835545ad90a08409 (diff) | |
Merge branch 'for-upstream/platform-x86_tpacpi' of git://repo.or.cz/linux-2.6/linux-acpi-2.6/ibm-acpi-2.6 into x86-platform
Diffstat (limited to 'drivers/platform/x86/Kconfig')
| -rw-r--r-- | drivers/platform/x86/Kconfig | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index aef4f17cdfd4..92161c7ff4b7 100644 --- 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" |