Merge branches 'release' and 'menlo' into release

[linux-2.6-omap-h63xx.git] / drivers / misc / Kconfig

diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index b1f9a405c8228e7aba63dd098f52074ffe331a77..f20c30cf99e067addea43dab00ffa938a299b9d5 100644 (file)
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -251,4 +251,13 @@ config ATMEL_SSC
 
          If unsure, say N.
 
+config INTEL_MENLOW
+       tristate "Thermal Management driver for Intel menlow platform"
+       depends on ACPI_THERMAL
+       ---help---
+         ACPI thermal management enhancement driver on
+         Intel Menlow platform.
+
+         If unsure, say N.
+
 endif # MISC_DEVICES