aboutsummaryrefslogtreecommitdiff
path: root/drivers/acpi
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2011-01-12 05:03:39 -0500
committerLen Brown <len.brown@intel.com>2011-01-12 05:03:39 -0500
commit63e8078a12ed287f40f39082ff87e8db6621dab9 (patch)
treea93563d69014b15f66968864bfed3938521fc974 /drivers/acpi
parent4b63bd35eb4e7959b0f7be17634689d34311524b (diff)
parent4464ed3b05de7a41ae55c74109cec8aeb138ce14 (diff)
downloadlinux-linaro-android-63e8078a12ed287f40f39082ff87e8db6621dab9.tar.gz
Merge branch 'kconfig-text' into release
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/Kconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 865fcb3c480..10c7ad59c0e 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.