diff options
author | Len Brown <len.brown@intel.com> | 2011-01-12 05:03:39 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2011-01-12 05:03:39 -0500 |
commit | 63e8078a12ed287f40f39082ff87e8db6621dab9 (patch) | |
tree | a93563d69014b15f66968864bfed3938521fc974 /drivers/acpi | |
parent | 4b63bd35eb4e7959b0f7be17634689d34311524b (diff) | |
parent | 4464ed3b05de7a41ae55c74109cec8aeb138ce14 (diff) |
Merge branch 'kconfig-text' into release
Diffstat (limited to 'drivers/acpi')
-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 865fcb3c4807..10c7ad59c0e1 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig | |||
@@ -51,7 +51,6 @@ config ACPI_PROCFS | |||
51 | For backwards compatibility, this option allows | 51 | For backwards compatibility, this option allows |
52 | deprecated /proc/acpi/ files to exist, even when | 52 | deprecated /proc/acpi/ files to exist, even when |
53 | they have been replaced by functions in /sys. | 53 | they have been replaced by functions in /sys. |
54 | The deprecated files (and their replacements) include: | ||
55 | 54 | ||
56 | This option has no effect on /proc/acpi/ files | 55 | This option has no effect on /proc/acpi/ files |
57 | and functions which do not yet exist in /sys. | 56 | and functions which do not yet exist in /sys. |