diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-08 09:25:58 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-08 09:25:58 -0800 |
| commit | 7b791d445500c5674b1ef00fefc0e343ed2f85b7 (patch) | |
| tree | fcb14a27185616c694817cbc4b534c91099abb6e /drivers/misc | |
| parent | 8811930dc74a503415b35c4a79d14fb0b408a361 (diff) | |
| parent | 2e6c4e5101633a54aeee1f2e83020ee77fcb70d2 (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
acer-wmi, tc1100-wmi: select ACPI_WMI
ACPI: WMI: Improve Kconfig description
ACPI: DMI: add Panasonic CF-52 and Thinpad X61
ACPI: thermal: syntax, spelling, kernel-doc
intel_menlo: build on X86 only
ACPI: build WMI on X86 only
ACPI: cpufreq: Print _PPC changes via cpufreq debug layer
ACPI: add newline to printk
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/Kconfig | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index 1941587a7aa2..c143a86c2ea6 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -106,9 +106,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, @@ -155,7 +155,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. @@ -288,6 +288,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. |