diff options
author | Len Brown <len.brown@intel.com> | 2008-02-07 03:19:43 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2008-02-07 03:19:43 -0500 |
commit | 060195500e0347a6ba8ea89739a9898961eb6f2b (patch) | |
tree | 5afba4e8daae642d33b7a4daa97d63c54776b786 /drivers/misc/Kconfig | |
parent | 26b6f2236615649a0ae6a0de2e9e71a2f9ffeba7 (diff) | |
parent | dd8cd7793781c87be47bbfee65efa3fb5110f898 (diff) |
Merge branches 'release' and 'wmi-2.6.25' into release
Diffstat (limited to 'drivers/misc/Kconfig')
-rw-r--r-- | drivers/misc/Kconfig | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index f20c30cf99e0..78cd33861766 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -92,6 +92,22 @@ config TIFM_7XX1 To compile this driver as a module, choose M here: the module will be called tifm_7xx1. +config ACER_WMI + tristate "Acer WMI Laptop Extras (EXPERIMENTAL)" + depends on X86 + depends on EXPERIMENTAL + depends on ACPI + depends on ACPI_WMI + depends on LEDS_CLASS + depends on BACKLIGHT_CLASS_DEVICE + ---help--- + This is a driver for newer Acer (and Wistron) laptops. It adds + wireless radio and bluetooth control, and on some laptops, + exposes the mail LED and LCD backlight. + + If you have an ACPI-WMI compatible Acer/ Wistron laptop, say Y or M + here. + config ASUS_LAPTOP tristate "Asus Laptop Extras (EXPERIMENTAL)" depends on X86 @@ -126,6 +142,15 @@ config FUJITSU_LAPTOP If you have a Fujitsu laptop, say Y or M here. +config TC1100_WMI + tristate "HP Compaq TC1100 Tablet WMI Extras" + depends on X86 && !X86_64 + depends on ACPI + depends on ACPI_WMI + ---help--- + This is a driver for the WMI extensions (wireless and bluetooth power + control) of the HP Compaq TC1100 tablet. + config MSI_LAPTOP tristate "MSI Laptop Extras" depends on X86 |