summaryrefslogtreecommitdiff
path: root/drivers/acpi/Kconfig
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2008-02-07 03:19:43 -0500
committerLen Brown <len.brown@intel.com>2008-02-07 03:19:43 -0500
commit060195500e0347a6ba8ea89739a9898961eb6f2b (patch)
tree5afba4e8daae642d33b7a4daa97d63c54776b786 /drivers/acpi/Kconfig
parent26b6f2236615649a0ae6a0de2e9e71a2f9ffeba7 (diff)
parentdd8cd7793781c87be47bbfee65efa3fb5110f898 (diff)
downloadlinux-3.10-060195500e0347a6ba8ea89739a9898961eb6f2b.tar.gz
linux-3.10-060195500e0347a6ba8ea89739a9898961eb6f2b.tar.bz2
linux-3.10-060195500e0347a6ba8ea89739a9898961eb6f2b.zip
Merge branches 'release' and 'wmi-2.6.25' into release
Diffstat (limited to 'drivers/acpi/Kconfig')
-rw-r--r--drivers/acpi/Kconfig10
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 558372957fd..0065f379457 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -200,6 +200,16 @@ config ACPI_NUMA
depends on (X86 || IA64)
default y if IA64_GENERIC || IA64_SGI_SN2
+config ACPI_WMI
+ tristate "WMI (EXPERIMENTAL)"
+ depends on EXPERIMENTAL
+ help
+ This driver adds support for the ACPI-WMI mapper device (PNP0C14)
+ found on some systems.
+
+ NOTE: You will need another driver or userspace application on top of
+ this to actually use anything defined in the ACPI-WMI mapper.
+
config ACPI_ASUS
tristate "ASUS/Medion Laptop Extras"
depends on X86