diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-06 04:14:13 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-06 04:14:13 -0500 |
commit | 451ec6ab310602515b361418debe93d00f67e273 (patch) | |
tree | 933cbbe7232ae6cb19986012e3162e65a184b77a /drivers/acpi/Kconfig | |
parent | fe54ceda4dd71b6155f4a58cd2aad3a780cb347d (diff) | |
parent | 436b0f76f2cee6617f27a649637766628909dd5d (diff) | |
download | talos-op-linux-451ec6ab310602515b361418debe93d00f67e273.tar.gz talos-op-linux-451ec6ab310602515b361418debe93d00f67e273.zip |
Merge branch 'master'
Diffstat (limited to 'drivers/acpi/Kconfig')
-rw-r--r-- | drivers/acpi/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index fe1e8126fbae..fce21c257523 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -197,7 +197,6 @@ config ACPI_ASUS config ACPI_IBM tristate "IBM ThinkPad Laptop Extras" depends on X86 - default y ---help--- This is a Linux ACPI driver for the IBM ThinkPad laptops. It adds support for Fn-Fx key combinations, Bluetooth control, video |