summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2011-01-12 11:03:39 +0100
committerLen Brown <len.brown@intel.com>2011-01-12 11:03:39 +0100
commit63e8078a12ed287f40f39082ff87e8db6621dab9 (patch)
treea93563d69014b15f66968864bfed3938521fc974
parentMerge branch 'ipmi' into release (diff)
parentACPI: update CONFIG_ACPI_PROCFS description (diff)
downloadlinux-63e8078a12ed287f40f39082ff87e8db6621dab9.tar.xz
linux-63e8078a12ed287f40f39082ff87e8db6621dab9.zip
Merge branch 'kconfig-text' into release
-rw-r--r--drivers/acpi/Kconfig1
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
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.