diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-03 21:03:28 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-03 21:03:28 -0500 |
commit | 2fde9901f6702ab82b5b2740fec9a7f9a80ddde4 (patch) | |
tree | 0ca92fabd4169095a50b43b8981d2a6c54f98531 /drivers/acpi/Kconfig | |
parent | f89c2b464558a21fd3be8d578b7d13e810fb6b8a (diff) | |
parent | 3b6efee9231e12fce09c94930bfc59f66f18d662 (diff) | |
download | kernel-crypto-2fde9901f6702ab82b5b2740fec9a7f9a80ddde4.tar.gz kernel-crypto-2fde9901f6702ab82b5b2740fec9a7f9a80ddde4.tar.xz kernel-crypto-2fde9901f6702ab82b5b2740fec9a7f9a80ddde4.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 fe1e8126fba..fce21c25752 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 |