From: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx> The kernel help consistently uses 'directory' Signed-off-by: Alan Cox <alan@xxxxxxxxxx> Signed-off-by: Len Brown <len.brown@xxxxxxxxx> --- drivers/acpi/Kconfig | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index ccf6ea9..95588c2 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -68,26 +68,28 @@ config ACPI_PROCFS Say N to delete /proc/acpi/ files that have moved to /sys/ config ACPI_PROCFS_POWER - bool "Deprecated power /proc/acpi folders" + bool "Deprecated power /proc/acpi directories" depends on PROC_FS default y ---help--- For backwards compatibility, this option allows - deprecated power /proc/acpi/ folders to exist, even when + deprecated power /proc/acpi/ directories to exist, even when they have been replaced by functions in /sys. - The deprecated folders (and their replacements) include: + The deprecated directories (and their replacements) include: /proc/acpi/battery/* (/sys/class/power_supply/*) /proc/acpi/ac_adapter/* (sys/class/power_supply/*) - This option has no effect on /proc/acpi/ folders + This option has no effect on /proc/acpi/ directories and functions, which do not yet exist in /sys - Say N to delete power /proc/acpi/ folders that have moved to /sys/ + Say N to delete power /proc/acpi/ directories that have moved to /sys/ + config ACPI_SYSFS_POWER bool "Future power /sys interface" select POWER_SUPPLY default y ---help--- Say N to disable power /sys interface + config ACPI_PROC_EVENT bool "Deprecated /proc/acpi/event support" depends on PROC_FS -- 1.5.4.23.gef5b9 - To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html