Merge branch 'kconfig-text' into release

63e8078a · Len Brown · 4b63bd35 · 4464ed3b · 63e8078a
Commit 63e8078a authored Jan 12, 2011 by Len Brown
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

drivers/acpi/Kconfig drivers/acpi/Kconfig +0 -1

No files found.
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -51,7 +51,6 @@ config ACPI_PROCFS
 	  For backwards compatibility, this option allows
 	  deprecated /proc/acpi/ files to exist, even when
 	  they have been replaced by functions in /sys.
-	  The deprecated files (and their replacements) include:

 	  This option has no effect on /proc/acpi/ files
 	  and functions which do not yet exist in /sys.