diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-12-05 10:48:41 -0500 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-12-05 10:48:41 -0500 |
| commit | 292d4ed32e35df4755052b5002e533348d1648fd (patch) | |
| tree | 8522e6bab962696bd25a6c02fb068c674a09b7ee /drivers/acpi/Kconfig | |
| parent | 3c6af7fa787f21f8873a050568ed892312899eb5 (diff) | |
| parent | e4f5c82a92c2a546a16af1614114eec19120e40a (diff) | |
Merge branch 'master' of /usr/src/ntfs-2.6/
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 fe1e8126fb..fce21c2575 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig | |||
| @@ -197,7 +197,6 @@ config ACPI_ASUS | |||
| 197 | config ACPI_IBM | 197 | config ACPI_IBM |
| 198 | tristate "IBM ThinkPad Laptop Extras" | 198 | tristate "IBM ThinkPad Laptop Extras" |
| 199 | depends on X86 | 199 | depends on X86 |
| 200 | default y | ||
| 201 | ---help--- | 200 | ---help--- |
| 202 | This is a Linux ACPI driver for the IBM ThinkPad laptops. It adds | 201 | This is a Linux ACPI driver for the IBM ThinkPad laptops. It adds |
| 203 | support for Fn-Fx key combinations, Bluetooth control, video | 202 | support for Fn-Fx key combinations, Bluetooth control, video |