Merge git://git.infradead.org/~dwmw2/ideapad-2.6

[sfrench/cifs-2.6.git] / drivers / platform / x86 / Kconfig

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 79baa6368f79a67c0c2c170359f66a0a68bd8b1b..044f430f3b4324eb031f32b3e9aeaf1307309a7d 100644 (file)
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -219,6 +219,13 @@ config SONYPI_COMPAT
          ---help---
          Build the sonypi driver compatibility code into the sony-laptop driver.
 
+config IDEAPAD_ACPI
+       tristate "Lenovo IdeaPad ACPI Laptop Extras"
+       depends on ACPI
+       depends on RFKILL
+       help
+         This is a driver for the rfkill switches on Lenovo IdeaPad netbooks.
+
 config THINKPAD_ACPI
        tristate "ThinkPad ACPI Laptop Extras"
        depends on ACPI