summaryrefslogtreecommitdiff
path: root/drivers/misc
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2008-02-08 01:22:26 -0500
committerLen Brown <len.brown@intel.com>2008-02-08 01:22:26 -0500
commit2e6c4e5101633a54aeee1f2e83020ee77fcb70d2 (patch)
tree8cff8aa4f2414f6637e8052d0bcc69f8ecb162e5 /drivers/misc
parent446b1dfc4cd1c2bbc7eb22d5fec38e23a577492c (diff)
parent4a507d93fac78ecd37d18343c57c564f6a126f01 (diff)
Merge branches 'release', 'dmi' and 'misc' into release
Diffstat (limited to 'drivers/misc')
-rw-r--r--drivers/misc/Kconfig5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 7b5220ca7d7f..4e7f0002ad5f 100644
--- 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.