diff options
| author | Len Brown <len.brown@intel.com> | 2007-07-22 02:28:06 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-07-22 02:28:06 -0400 |
| commit | 08e31686d6d119ba26bf0690f5f872f6f5bd1a97 (patch) | |
| tree | 4568c690296eede145bdcc6555834b939d0a6c2c /drivers/misc/Kconfig | |
| parent | d6da5ce8cc71a13e2f3671361c5a8bd9b82e014d (diff) | |
| parent | f432255e936a892a6896e5032e2b4897423076f2 (diff) | |
Pull thinkpad into release branch
Diffstat (limited to 'drivers/misc/Kconfig')
| -rw-r--r-- | drivers/misc/Kconfig | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index 1d516f24ba5..aaaa61ea421 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -150,6 +150,7 @@ config THINKPAD_ACPI depends on X86 && ACPI select BACKLIGHT_CLASS_DEVICE select HWMON + select NVRAM ---help--- This is a driver for the IBM and Lenovo ThinkPad laptops. It adds support for Fn-Fx key combinations, Bluetooth control, video @@ -196,4 +197,17 @@ config THINKPAD_ACPI_BAY If you are not sure, say Y here. +config THINKPAD_ACPI_INPUT_ENABLED + bool "Enable input layer support by default" + depends on THINKPAD_ACPI + default y + ---help--- + Enables hot key handling over the input layer by default. If unset, + the driver does not enable any hot key handling by default, and also + starts up with a mostly empty keymap. + + If you are not sure, say Y here. Say N to retain the deprecated + behavior of ibm-acpi, and thinkpad-acpi for kernels up to 2.6.21. + + endif # MISC_DEVICES |