Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / platform / x86 / Kconfig

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index faec777b1ed433de38514c479fc17dc2ebf96c00..a59af5b24f0ac9d9f0e4ea7c88cc2ad00ddddbb0 100644 (file)
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -18,12 +18,14 @@ if X86_PLATFORM_DEVICES
 config ACER_WMI
        tristate "Acer WMI Laptop Extras"
        depends on ACPI
-       depends on LEDS_CLASS
-       depends on NEW_LEDS
+       select LEDS_CLASS
+       select NEW_LEDS
        depends on BACKLIGHT_CLASS_DEVICE
        depends on SERIO_I8042
+       depends on INPUT
        depends on RFKILL || RFKILL = n
-       select ACPI_WMI
+       depends on ACPI_WMI
+       select INPUT_SPARSEKMAP
        ---help---
          This is a driver for newer Acer (and Wistron) laptops. It adds
          wireless radio and bluetooth control, and on some laptops,
@@ -131,7 +133,7 @@ config TC1100_WMI
        depends on !X86_64
        depends on EXPERIMENTAL
        depends on ACPI
-       select ACPI_WMI
+       depends on ACPI_WMI
        ---help---
          This is a driver for the WMI extensions (wireless and bluetooth power
          control) of the HP Compaq TC1100 tablet.
@@ -225,7 +227,8 @@ config SONYPI_COMPAT
 config IDEAPAD_LAPTOP
        tristate "Lenovo IdeaPad Laptop Extras"
        depends on ACPI
-       depends on RFKILL
+       depends on RFKILL && INPUT
+       select INPUT_SPARSEKMAP
        help
          This is a driver for the rfkill switches on Lenovo IdeaPad netbooks.
 
@@ -425,7 +428,10 @@ config EEEPC_WMI
        depends on INPUT
        depends on EXPERIMENTAL
        depends on BACKLIGHT_CLASS_DEVICE
+       depends on RFKILL || RFKILL = n
        select INPUT_SPARSEKMAP
+       select LEDS_CLASS
+       select NEW_LEDS
        ---help---
          Say Y here if you want to support WMI-based hotkeys on Eee PC laptops.
 
@@ -510,8 +516,8 @@ config TOPSTAR_LAPTOP
 config ACPI_TOSHIBA
        tristate "Toshiba Laptop Extras"
        depends on ACPI
-       depends on LEDS_CLASS
-       depends on NEW_LEDS
+       select LEDS_CLASS
+       select NEW_LEDS
        depends on BACKLIGHT_CLASS_DEVICE
        depends on INPUT
        depends on RFKILL || RFKILL = n
@@ -576,6 +582,15 @@ config INTEL_SCU_IPC
          some embedded Intel x86 platforms. This is not needed for PC-type
          machines.
 
+config INTEL_SCU_IPC_UTIL
+       tristate "Intel SCU IPC utility driver"
+       depends on INTEL_SCU_IPC
+       default y
+       ---help---
+         The IPC Util driver provides an interface with the SCU enabling
+         low level access for debug work and updating the firmware. Say
+         N unless you will be doing this on an Intel MID platform.
+
 config GPIO_INTEL_PMIC
        bool "Intel PMIC GPIO support"
        depends on INTEL_SCU_IPC && GPIOLIB