diff options
author | Hugh Dickins <hugh@veritas.com> | 2007-08-27 11:04:39 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-27 13:27:48 -0400 |
commit | 721ebe005c3bb9add55b2e462dfc1bcf8efc6b8f (patch) | |
tree | 1b76114dec1d27e31cf165fc10b03705a95d83ea | |
parent | 813409771731d80e6fa94199adf99f2269a4afc0 (diff) |
reverse CONFIG_ACPI_PROC_EVENT default
Sigh. Again an ACPI assault on the Thinkpad's Fn+F4 to suspend to RAM.
The default and text for CONFIG_THINKPAD_ACPI_INPUT_ENABLED were fixed
in -rc3, but now commit 14e04fb34ffa82ee61ae69f98d8fca12d2e8e31c ("ACPI:
Schedule /proc/acpi/event for removal") introduces the ACPI_PROC_EVENT
config entry, and defaults it to 'n' to disable it again.
Change default to y, and add comment to make it clearer that n is for
future distros.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Len Brown <len.brown@intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/acpi/Kconfig | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index 574259476fbf..4875f0149eb4 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig | |||
@@ -71,6 +71,7 @@ config ACPI_PROCFS | |||
71 | config ACPI_PROC_EVENT | 71 | config ACPI_PROC_EVENT |
72 | bool "Deprecated /proc/acpi/event support" | 72 | bool "Deprecated /proc/acpi/event support" |
73 | depends on PROC_FS | 73 | depends on PROC_FS |
74 | default y | ||
74 | ---help--- | 75 | ---help--- |
75 | A user-space daemon, acpi, typically read /proc/acpi/event | 76 | A user-space daemon, acpi, typically read /proc/acpi/event |
76 | and handled all ACPI sub-system generated events. | 77 | and handled all ACPI sub-system generated events. |
@@ -78,10 +79,13 @@ config ACPI_PROC_EVENT | |||
78 | These events are now delivered to user-space via | 79 | These events are now delivered to user-space via |
79 | either the input layer, or as netlink events. | 80 | either the input layer, or as netlink events. |
80 | 81 | ||
81 | This build option enables the old code for for legacy | 82 | This build option enables the old code for legacy |
82 | user-space implementation. After some time, this will | 83 | user-space implementation. After some time, this will |
83 | be moved under CONFIG_ACPI_PROCFS, and then deleted. | 84 | be moved under CONFIG_ACPI_PROCFS, and then deleted. |
84 | 85 | ||
86 | Say Y here to retain the old behaviour. Say N if your | ||
87 | user-space is newer than kernel 2.6.23 (September 2007). | ||
88 | |||
85 | config ACPI_AC | 89 | config ACPI_AC |
86 | tristate "AC Adapter" | 90 | tristate "AC Adapter" |
87 | depends on X86 | 91 | depends on X86 |