Merge branch 'msi-wmi' into release

diff --combined drivers/platform/x86/Kconfig
index e5e4312,a006dec..ba3638f
--- 1/drivers/platform/x86/Kconfig
--- 2/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@@ -334,8 -334,6 +334,8 @@@ config EEEPC_LAPTO
        depends on HOTPLUG_PCI
        select BACKLIGHT_CLASS_DEVICE
        select HWMON
 +      select LEDS_CLASS
 +      select NEW_LEDS
        ---help---
          This driver supports the Fn-Fx keys on Eee PC laptops.
  
@@@ -367,6 -365,18 +367,18 @@@ config ACPI_WM
          It is safe to enable this driver even if your DSDT doesn't define
          any ACPI-WMI devices.
  
+ config MSI_WMI
+       tristate "MSI WMI extras"
+       depends on ACPI_WMI
+       depends on INPUT
+       depends on BACKLIGHT_CLASS_DEVICE
+       select INPUT_SPARSEKMAP
+       help
+        Say Y here if you want to support WMI-based hotkeys on MSI laptops.
+ 
+        To compile this driver as a module, choose M here: the module will
+        be called msi-wmi.
+ 
  config ACPI_ASUS
        tristate "ASUS/Medion Laptop Extras (DEPRECATED)"
        depends on ACPI