Merge branches 'release', 'dmi' and 'misc' into release

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

diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 7b5220ca7d7f988220f139e613d3450e72b1607d..4e7f0002ad5f8e2b4f72e0d9a5c0612a9a890c79 100644 (file)
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -97,9 +97,9 @@ config ACER_WMI
        depends on X86
        depends on EXPERIMENTAL
        depends on ACPI
-       depends on ACPI_WMI
        depends on LEDS_CLASS
        depends on BACKLIGHT_CLASS_DEVICE
+       select ACPI_WMI
        ---help---
          This is a driver for newer Acer (and Wistron) laptops. It adds
          wireless radio and bluetooth control, and on some laptops,
@@ -146,7 +146,7 @@ config TC1100_WMI
        tristate "HP Compaq TC1100 Tablet WMI Extras"
        depends on X86 && !X86_64
        depends on ACPI
-       depends on ACPI_WMI
+       select ACPI_WMI
        ---help---
          This is a driver for the WMI extensions (wireless and bluetooth power
          control) of the HP Compaq TC1100 tablet.
@@ -279,6 +279,7 @@ config ATMEL_SSC
 config INTEL_MENLOW
        tristate "Thermal Management driver for Intel menlow platform"
        depends on ACPI_THERMAL
+       depends on X86
        ---help---
          ACPI thermal management enhancement driver on
          Intel Menlow platform.