Merge branch 'dell-wmi' into release

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

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index a27bff3007c8e1b23aef19e7448aa029f75b3355..284ebaca6e454797622c136213a7e05b48e1d46e 100644 (file)
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -175,6 +175,7 @@ config SONY_LAPTOP
        depends on ACPI
        select BACKLIGHT_CLASS_DEVICE
        depends on INPUT
+       depends on RFKILL
          ---help---
          This mini-driver drives the SNC and SPIC devices present in the ACPI
          BIOS of the Sony Vaio laptops.
@@ -236,6 +237,30 @@ config THINKPAD_ACPI_DEBUG
 
          If you are not sure, say N here.
 
+config THINKPAD_ACPI_UNSAFE_LEDS
+       bool "Allow control of important LEDs (unsafe)"
+       depends on THINKPAD_ACPI
+       default n
+       ---help---
+         Overriding LED state on ThinkPads can mask important
+         firmware alerts (like critical battery condition), or misled
+         the user into damaging the hardware (undocking or ejecting
+         the bay while buses are still active), etc.
+
+         LED control on the ThinkPad is write-only (with very few
+         exceptions on very ancient models), which makes it
+         impossible to know beforehand if important information will
+         be lost when one changes LED state.
+
+         Users that know what they are doing can enable this option
+         and the driver will allow control of every LED, including
+         the ones on the dock stations.
+
+         Never enable this option on a distribution kernel.
+
+         Say N here, unless you are building a kernel for your own
+         use, and need to control the important firmware LEDs.
+
 config THINKPAD_ACPI_DOCK
        bool "Legacy Docking Station Support"
        depends on THINKPAD_ACPI