1 files changed, 35 insertions, 0 deletions

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 3608081bc3e0..284ebaca6e45 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -67,6 +67,16 @@ config DELL_LAPTOP
         This driver adds support for rfkill and backlight control to Dell
         laptops.
 
+config DELL_WMI
+        tristate "Dell WMI extras"
+        depends on ACPI_WMI
+        depends on INPUT
+        ---help---
+          Say Y here if you want to support WMI-based hotkeys on Dell laptops.
+
+          To compile this driver as a module, choose M here: the module will
+          be called dell-wmi.
+
 config FUJITSU_LAPTOP
         tristate "Fujitsu Laptop Extras"
         depends on ACPI
@@ -165,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.
@@ -226,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