Merge tag 'platform-drivers-x86-v4.2-1' of git://git.infradead.org/users/dvhart/linux...

[uclinux-h8/linux.git] / drivers / platform / x86 / Kconfig

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 7137a07..1e2f57f 100644 (file)
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -141,6 +141,22 @@ config DELL_SMO8800
          To compile this driver as a module, choose M here: the module will
          be called dell-smo8800.
 
+config DELL_RBTN
+       tristate "Dell Airplane Mode Switch driver"
+       depends on ACPI
+       depends on INPUT
+       depends on RFKILL
+       ---help---
+         Say Y here if you want to support Dell Airplane Mode Switch ACPI
+         device on Dell laptops. Sometimes it has names: DELLABCE or DELRBTN.
+         This driver register rfkill device or input hotkey device depending
+         on hardware type (hw switch slider or keyboard toggle button). For
+         rfkill devices it receive HW switch events and set correct hard
+         rfkill state.
+
+         To compile this driver as a module, choose M here: the module will
+         be called dell-rbtn.
+
 
 config FUJITSU_LAPTOP
        tristate "Fujitsu Laptop Extras"
@@ -622,7 +638,6 @@ config ACPI_TOSHIBA
        select NEW_LEDS
        depends on BACKLIGHT_CLASS_DEVICE
        depends on INPUT
-       depends on RFKILL || RFKILL = n
        depends on SERIO_I8042 || SERIO_I8042 = n
        depends on ACPI_VIDEO || ACPI_VIDEO = n
        select INPUT_POLLDEV
@@ -653,6 +668,7 @@ config ACPI_TOSHIBA
 config TOSHIBA_BT_RFKILL
        tristate "Toshiba Bluetooth RFKill switch support"
        depends on ACPI
+       depends on RFKILL || RFKILL = n
        ---help---
          This driver adds support for Bluetooth events for the RFKill
          switch on modern Toshiba laptops with full ACPI support and