Merge branch 'kconfig-text' into release

2011-01-12 05:03:39 -05:00 · 2011-01-12 05:03:39 -05:00 · 63e8078a12
commit 63e8078a12
parent 4b63bd35eb 4464ed3b05
1 changed files with 0 additions and 1 deletions
--- 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.