msi-laptop: fix config-dependent build error

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

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 53f818d23edbf15e379ebd98dc620bc3b99e6b9c..0485e394712aa4645cc695230f2dcaaca1664af3 100644 (file)
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -187,7 +187,8 @@ config MSI_LAPTOP
        depends on ACPI
        depends on BACKLIGHT_CLASS_DEVICE
        depends on RFKILL
-       depends on SERIO_I8042
+       depends on INPUT && SERIO_I8042
+       select INPUT_SPARSEKMAP
        ---help---
          This is a driver for laptops built by MSI (MICRO-STAR
          INTERNATIONAL):
@@ -451,23 +452,53 @@ config EEEPC_LAPTOP
          Bluetooth, backlight and allows powering on/off some other
          devices.
 
-         If you have an Eee PC laptop, say Y or M here.
+         If you have an Eee PC laptop, say Y or M here. If this driver
+         doesn't work on your Eee PC, try eeepc-wmi instead.
 
-config EEEPC_WMI
-       tristate "Eee PC WMI Hotkey Driver (EXPERIMENTAL)"
+config ASUS_WMI
+       tristate "ASUS WMI Driver (EXPERIMENTAL)"
        depends on ACPI_WMI
        depends on INPUT
+       depends on HWMON
        depends on EXPERIMENTAL
        depends on BACKLIGHT_CLASS_DEVICE
        depends on RFKILL || RFKILL = n
+       depends on HOTPLUG_PCI
        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.
+         Say Y here if you have a WMI aware Asus laptop (like Eee PCs or new
+         Asus Notebooks).
 
          To compile this driver as a module, choose M here: the module will
-         be called eeepc-wmi.
+         be called asus-wmi.
+
+config ASUS_NB_WMI
+       tristate "Asus Notebook WMI Driver (EXPERIMENTAL)"
+       depends on ASUS_WMI
+       ---help---
+         This is a driver for newer Asus notebooks. It adds extra features
+         like wireless radio and bluetooth control, leds, hotkeys, backlight...
+
+         For more informations, see
+         <file:Documentation/ABI/testing/sysfs-platform-asus-wmi>
+
+         If you have an ACPI-WMI compatible Asus Notebook, say Y or M
+         here.
+
+config EEEPC_WMI
+       tristate "Eee PC WMI Driver (EXPERIMENTAL)"
+       depends on ASUS_WMI
+       ---help---
+         This is a driver for newer Eee PC laptops. It adds extra features
+         like wireless radio and bluetooth control, leds, hotkeys, backlight...
+
+         For more informations, see
+         <file:Documentation/ABI/testing/sysfs-platform-asus-wmi>
+
+         If you have an ACPI-WMI compatible Eee PC laptop (>= 1000), say Y or M
+         here.
 
 config ACPI_WMI
        tristate "WMI"
@@ -637,6 +668,13 @@ config INTEL_MID_POWER_BUTTON
 
          If unsure, say N.
 
+config INTEL_MFLD_THERMAL
+       tristate "Thermal driver for Intel Medfield platform"
+       depends on INTEL_SCU_IPC && THERMAL
+       help
+         Say Y here to enable thermal driver support for the  Intel Medfield
+         platform.
+
 config RAR_REGISTER
        bool "Restricted Access Region Register Driver"
        depends on PCI && X86_MRST
@@ -702,4 +740,17 @@ config XO15_EBOOK
          This switch is triggered as the screen is rotated and folded down to
          convert the device into ebook form.
 
+config SAMSUNG_LAPTOP
+       tristate "Samsung Laptop driver"
+       depends on RFKILL && BACKLIGHT_CLASS_DEVICE && X86
+       ---help---
+         This module implements a driver for a wide range of different
+         Samsung laptops.  It offers control over the different
+         function keys, wireless LED, LCD backlight level, and
+         sometimes provides a "performance_control" sysfs file to allow
+         the performance level of the laptop to be changed.
+
+         To compile this driver as a module, choose M here: the module
+         will be called samsung-laptop.
+
 endif # X86_PLATFORM_DEVICES