From 148904521f465e7a135cdb680f38c14921c1f5ee Mon Sep 17 00:00:00 2001 From: Henrique de Moraes Holschuh Date: Sun, 5 Aug 2007 15:20:45 -0300 Subject: [PATCH] --- yaml --- r: 63939 b: refs/heads/master c: 5f70bf7510e5e51b0bac32b1470c92e9332452a4 h: refs/heads/master i: 63937: d6d04c62b9b54096a4c7426e77edfd6920cc3915 63935: ba2833d56763a5de6a0e10ea21fcf88f9bd5cb12 v: v3 --- [refs] | 2 +- trunk/drivers/misc/Kconfig | 22 +++++++++++++++------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 70e0742bf551..016ef20587f9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ac36393de6034be7266264a435360e7628849005 +refs/heads/master: 5f70bf7510e5e51b0bac32b1470c92e9332452a4 diff --git a/trunk/drivers/misc/Kconfig b/trunk/drivers/misc/Kconfig index aaaa61ea4217..518d5d335464 100644 --- a/trunk/drivers/misc/Kconfig +++ b/trunk/drivers/misc/Kconfig @@ -200,14 +200,22 @@ config THINKPAD_ACPI_BAY config THINKPAD_ACPI_INPUT_ENABLED bool "Enable input layer support by default" depends on THINKPAD_ACPI - default y + default n ---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. + This option enables thinkpad-acpi hot key handling over the input + layer at driver load time. When it is unset, the driver does not + enable hot key handling by default, and also starts up with a mostly + empty keymap. + + This option should be enabled if you have a new enough HAL or other + userspace support that properly handles the thinkpad-acpi event + device. It auto-tunes the hot key support to those reported by the + firmware and enables it automatically. + + If unsure, say N here to retain the old behaviour of ibm-acpi, and + thinkpad-acpi up to kernel 2.6.21: userspace will have to enable and + set up the thinkpad-acpi hot key handling using the sysfs interace + after loading the driver. endif # MISC_DEVICES