Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86: (36 commits)
  sony-laptop: support new hotkeys on the P, Z and EC series
  platform/x86: Consistently select LEDS Kconfig options
  sony-laptop: fix sparse non-ANSI function warning
  intel_ips: fix sparse non-ANSI function warning
  Support KHLB2 in the compal laptop driver
  acer-wmi: Enabled Acer Launch Manager mode
  [PATCH] intel_pmic_gpio: modify EOI handling following change of kernel irq subsystem
  ACPI Thinkpad: We must always call va_end() after va_start() but do not do so in thinkpad_acpi.c::acpi_evalf()
  acer-wmi: Initialize wlan/bluetooth/wwan rfkill software block state
  acer-wmi: Detect the WiFi/Bluetooth/3G devices available
  acer-wmi: Add 3G rfkill sysfs file
  acer-wmi: Add acer wmi hotkey events support
  platform/x86: Kconfig: Replace select by depends on ACPI_WMI
  ideapad: pass ideapad_priv as argument (part 2)
  ideapad: pass ideapad_priv as argument (part 1)
  ideapad: add markups, unify comments and return result when init
  ideapad: add hotkey support
  ideapad: let camera power control entry under platform driver
  ideapad: add platform driver for ideapad
  fujitsu-laptop: fix compiler warning on pnp_ids
  ...

1 files changed, 21 insertions, 6 deletions

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index faec777b1ed4..d163bc2e2b9e 100644
--- 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.
@@ -226,6 +228,7 @@ config IDEAPAD_LAPTOP
         tristate "Lenovo IdeaPad Laptop Extras"
         depends on ACPI
         depends on RFKILL
+        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