Merge branch 'master' into for-next

[pandora-kernel.git] / arch / x86 / kernel / apic / io_apic.c

diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index 697dc34..303be81 100644 (file)
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -4026,7 +4026,7 @@ int mp_find_ioapic_pin(int ioapic, u32 gsi)
 static int bad_ioapic(unsigned long address)
 {
        if (nr_ioapics >= MAX_IO_APICS) {
-               printk(KERN_WARNING "WARING: Max # of I/O APICs (%d) exceeded "
+               printk(KERN_WARNING "WARNING: Max # of I/O APICs (%d) exceeded "
                       "(found %d), skipping\n", MAX_IO_APICS, nr_ioapics);
                return 1;
        }