platform/x86: Add rfkill dependency to ACPI_TOSHIBA entry

[deliverable/linux.git] / drivers / platform / x86 / Kconfig

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 744cb80fccbc7eb67f13d6ae5be560eb0fc7f334..6ae72638b1af3bfaea2ad097bfe19dc1516d10b1 100644 (file)
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -309,8 +309,8 @@ config COMPAL_LAPTOP
          This is a driver for laptops built by Compal, and some models by
          other brands (e.g. Dell, Toshiba).
 
-         It adds support for rfkill, Bluetooth, WLAN and LCD brightness
-         control.
+         It adds support for rfkill, Bluetooth, WLAN, LCD brightness, hwmon
+         and battery charging level control.
 
          For a (possibly incomplete) list of supported laptops, please refer
          to: Documentation/platform/x86-laptop-drivers.txt
@@ -345,6 +345,7 @@ config IDEAPAD_LAPTOP
        depends on SERIO_I8042
        depends on BACKLIGHT_CLASS_DEVICE
        depends on ACPI_VIDEO || ACPI_VIDEO = n
+       depends on ACPI_WMI || ACPI_WMI = n
        select INPUT_SPARSEKMAP
        help
          This is a driver for Lenovo IdeaPad netbooks contains drivers for
@@ -640,6 +641,7 @@ config ACPI_TOSHIBA
        depends on INPUT
        depends on SERIO_I8042 || SERIO_I8042 = n
        depends on ACPI_VIDEO || ACPI_VIDEO = n
+       depends on RFKILL || RFKILL = n
        select INPUT_POLLDEV
        select INPUT_SPARSEKMAP
        ---help---
@@ -700,6 +702,24 @@ config TOSHIBA_HAPS
          If you have a recent Toshiba laptop with a built-in accelerometer
          device, say Y.
 
+config TOSHIBA_WMI
+       tristate "Toshiba WMI Hotkeys Driver (EXPERIMENTAL)"
+       default n
+       depends on ACPI_WMI
+       depends on INPUT
+       select INPUT_SPARSEKMAP
+       ---help---
+         This driver adds hotkey monitoring support to some Toshiba models
+         that manage the hotkeys via WMI events.
+
+         WARNING: This driver is incomplete as it lacks a proper keymap and the
+         *notify function only prints the ACPI event type value. Be warned that
+         you will need to provide some information if you have a Toshiba model
+         with WMI event hotkeys and want to help with the develpment of this
+         driver.
+
+         If you have a WMI-based hotkeys Toshiba laptop, say Y or M here.
+
 config ACPI_CMPC
        tristate "CMPC Laptop Extras"
        depends on X86 && ACPI
@@ -925,4 +945,10 @@ config SURFACE_PRO3_BUTTON
        depends on ACPI && INPUT
        ---help---
          This driver handles the power/home/volume buttons on the Microsoft Surface Pro 3 tablet.
+
+config INTEL_PUNIT_IPC
+       tristate "Intel P-Unit IPC Driver"
+       ---help---
+         This driver provides support for Intel P-Unit Mailbox IPC mechanism,
+         which is used to bridge the communications between kernel and P-Unit.
 endif # X86_PLATFORM_DEVICES