summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/apei/Kconfig
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-11-01 13:58:18 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-11-01 13:58:18 -0400
commit6e1bd1ab1d9ab8e83cdc940df82fbf8418e2593f (patch)
treef1324a39f155375221ed88db0626f61b75c51db6 /drivers/acpi/apei/Kconfig
parentfec6dd833e733b5d9588a1f1e4d81118b79b5774 (diff)
parent76a6106f124e375df0ea6ba6bcf204b8caff786a (diff)
Merge branch 'for-2.6.37' into for-2.6.38
Diffstat (limited to 'drivers/acpi/apei/Kconfig')
-rw-r--r--drivers/acpi/apei/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/apei/Kconfig b/drivers/acpi/apei/Kconfig
index 907e350f1c7..fca34ccfd29 100644
--- a/drivers/acpi/apei/Kconfig
+++ b/drivers/acpi/apei/Kconfig
@@ -34,6 +34,6 @@ config ACPI_APEI_ERST_DEBUG
depends on ACPI_APEI
help
ERST is a way provided by APEI to save and retrieve hardware
- error infomation to and from a persistent store. Enable this
+ error information to and from a persistent store. Enable this
if you want to debugging and testing the ERST kernel support
and firmware implementation.