Merge branch 'master' into for-next

[pandora-kernel.git] / drivers / acpi / osl.c

diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 7594f65..4bc1c41 100644 (file)
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -1406,7 +1406,7 @@ acpi_os_invalidate_address(
        switch (space_id) {
        case ACPI_ADR_SPACE_SYSTEM_IO:
        case ACPI_ADR_SPACE_SYSTEM_MEMORY:
-               /* Only interference checks against SystemIO and SytemMemory
+               /* Only interference checks against SystemIO and SystemMemory
                   are needed */
                res.start = address;
                res.end = address + length - 1;
@@ -1458,7 +1458,7 @@ acpi_os_validate_address (
        switch (space_id) {
        case ACPI_ADR_SPACE_SYSTEM_IO:
        case ACPI_ADR_SPACE_SYSTEM_MEMORY:
-               /* Only interference checks against SystemIO and SytemMemory
+               /* Only interference checks against SystemIO and SystemMemory
                   are needed */
                res = kzalloc(sizeof(struct acpi_res_list), GFP_KERNEL);
                if (!res)