Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platf...

[sfrench/cifs-2.6.git] / drivers / platform / x86 / Kconfig

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 6c3320d7505533804881a56fb349534b4eea0e4c..3e1b8a288719d2047e911025e9fc6c1c8714d578 100644 (file)
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -390,6 +390,7 @@ config EEEPC_WMI
        depends on ACPI_WMI
        depends on INPUT
        depends on EXPERIMENTAL
+       depends on BACKLIGHT_CLASS_DEVICE
        select INPUT_SPARSEKMAP
        ---help---
          Say Y here if you want to support WMI-based hotkeys on Eee PC laptops.
@@ -527,4 +528,13 @@ config ACPI_CMPC
          keys as input device, backlight device, tablet and accelerometer
          devices.
 
+config INTEL_SCU_IPC
+       bool "Intel SCU IPC Support"
+       depends on X86_MRST
+       default y
+       ---help---
+         IPC is used to bridge the communications between kernel and SCU on
+         some embedded Intel x86 platforms. This is not needed for PC-type
+         machines.
+
 endif # X86_PLATFORM_DEVICES