Merge tag 'cris-for-3.12' of git://jni.nu/cris

[~andy/linux] / Documentation / acpi / enumeration.txt

diff --git a/Documentation/acpi/enumeration.txt b/Documentation/acpi/enumeration.txt
index d977778b5e67b78d521fd59707d0ddcd05a3ffc3..aca4e69121b7a2bb8ab38d2002066bcab49af915 100644 (file)
--- a/Documentation/acpi/enumeration.txt
+++ b/Documentation/acpi/enumeration.txt
@@ -207,7 +207,7 @@ passing those. One idea is to return this in _DSM method like:
                        Return (Local0)
                }
 
-Then the at25 SPI driver can get this configation by calling _DSM on its
+Then the at25 SPI driver can get this configuration by calling _DSM on its
 ACPI handle like:
 
        struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL };