samsung-laptop: add usb charge support

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

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 7f43cf86d77602675297aaea32932c9a176f4c07..15dbd8cc445f1a18aa5a8c2c1d4250fc614ccd64 100644 (file)
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -143,6 +143,30 @@ config FUJITSU_LAPTOP_DEBUG
 
          If you are not sure, say N here.
 
+config FUJITSU_TABLET
+       tristate "Fujitsu Tablet Extras"
+       depends on ACPI
+       depends on INPUT
+       ---help---
+         This is a driver for tablets built by Fujitsu:
+
+           * Lifebook P1510/P1610/P1620/Txxxx
+           * Stylistic ST5xxx
+           * Possibly other Fujitsu tablet models
+
+         It adds support for the panel buttons, docking station detection,
+         tablet/notebook mode detection for convertible and
+         orientation detection for docked slates.
+
+         If you have a Fujitsu convertible or slate, say Y or M here.
+
+config AMILO_RFKILL
+       tristate "Fujitsu-Siemens Amilo rfkill support"
+       depends on RFKILL
+       ---help---
+         This is a driver for enabling wifi on some Fujitsu-Siemens Amilo
+         laptops.
+
 config TC1100_WMI
        tristate "HP Compaq TC1100 Tablet WMI Extras (EXPERIMENTAL)"
        depends on !X86_64
@@ -639,7 +663,7 @@ config ACPI_CMPC
 
 config INTEL_SCU_IPC
        bool "Intel SCU IPC Support"
-       depends on X86_MRST
+       depends on X86_INTEL_MID
        default y
        ---help---
          IPC is used to bridge the communications between kernel and SCU on