Merge branch 'topic/jack' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[karo-tx-linux.git] / drivers / acpi / resource.c

diff --git a/drivers/acpi/resource.c b/drivers/acpi/resource.c
index 8b11d6d385dcd22a75f9f8bfdf9bd81856bf87ba..cd4c4271dc4cd6ec5c676eb849cabcdc6a1736b7 100644 (file)
--- a/drivers/acpi/resource.c
+++ b/drivers/acpi/resource.c
@@ -406,7 +406,7 @@ static void acpi_dev_get_irqresource(struct resource *res, u32 gsi,
        }
 
        /*
-        * In IO-APIC mode, use overrided attribute. Two reasons:
+        * In IO-APIC mode, use overridden attribute. Two reasons:
         * 1. BIOS bug in DSDT
         * 2. BIOS uses IO-APIC mode Interrupt Source Override
         *