summaryrefslogtreecommitdiff
path: root/drivers/acpi/apei/Kconfig
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-10-07 02:11:17 (GMT)
committerDavid S. Miller <davem@davemloft.net>2010-10-07 02:11:17 (GMT)
commit12e94471b2be5ef9b55b10004a3a2cd819490036 (patch)
treef84ae818687dc7c35bd54f11bfb9717278d28a4e /drivers/acpi/apei/Kconfig
parent79315068f4560f3f7bd6e9790190dcb43059770c (diff)
parentcb655d0f3d57c23db51b981648e452988c0223f9 (diff)
downloadlinux-fsl-qoriq-12e94471b2be5ef9b55b10004a3a2cd819490036.tar.xz
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
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 907e350..fca34cc 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.