memstick: add support for legacy memorysticks

[mirror_ubuntu-artful-kernel.git] / drivers / platform / x86 / Kconfig

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 85772616efbf02b82c61af7e0846baed894c273e..36a9e602339595de854f561ef725bd3bc3cd8bfa 100644 (file)
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -176,6 +176,7 @@ config FUJITSU_TABLET
 config AMILO_RFKILL
        tristate "Fujitsu-Siemens Amilo rfkill support"
        depends on RFKILL
+       depends on SERIO_I8042
        ---help---
          This is a driver for enabling wifi on some Fujitsu-Siemens Amilo
          laptops.
@@ -591,6 +592,7 @@ config ACPI_TOSHIBA
        depends on BACKLIGHT_CLASS_DEVICE
        depends on INPUT
        depends on RFKILL || RFKILL = n
+       depends on SERIO_I8042 || SERIO_I8042 = n
        select INPUT_POLLDEV
        select INPUT_SPARSEKMAP
        ---help---
@@ -781,6 +783,32 @@ config APPLE_GMUX
          graphics as well as the backlight. Currently only backlight
          control is supported by the driver.
 
+config INTEL_RST
+        tristate "Intel Rapid Start Technology Driver"
+       depends on ACPI
+       ---help---
+         This driver provides support for modifying paramaters on systems
+         equipped with Intel's Rapid Start Technology. When put in an ACPI
+         sleep state, these devices will wake after either a configured
+         timeout or when the system battery reaches a critical state,
+         automatically copying memory contents to disk. On resume, the
+         firmware will copy the memory contents back to RAM and resume the OS
+         as usual.
+
+config INTEL_SMARTCONNECT
+        tristate "Intel Smart Connect disabling driver"
+       depends on ACPI
+       ---help---
+         Intel Smart Connect is a technology intended to permit devices to
+         update state by resuming for a short period of time at regular
+         intervals. If a user enables this functionality under Windows and
+         then reboots into Linux, the system may remain configured to resume
+         on suspend. In the absence of any userspace to support it, the system
+         will then remain awake until something triggers another suspend.
+
+         This driver checks to determine whether the device has Intel Smart
+         Connect enabled, and if so disables it.
+
 config PVPANIC
        tristate "pvpanic device support"
        depends on ACPI