Merge branch 'x86/x2apic' into x86/core

[pandora-kernel.git] / include / asm-x86 / msidef.h

diff --git a/include/asm-x86/msidef.h b/include/asm-x86/msidef.h
index 57fd859..ed91902 100644 (file)
--- a/include/asm-x86/msidef.h
+++ b/include/asm-x86/msidef.h
@@ -1,5 +1,5 @@
-#ifndef ASM_MSIDEF_H
-#define ASM_MSIDEF_H
+#ifndef ASM_X86__MSIDEF_H
+#define ASM_X86__MSIDEF_H
 
 /*
  * Constants for Intel APIC based MSI messages.
@@ -52,4 +52,4 @@
 #define MSI_ADDR_IR_SHV                        (1 << 3)
 #define MSI_ADDR_IR_INDEX1(index)      ((index & 0x8000) >> 13)
 #define MSI_ADDR_IR_INDEX2(index)      ((index & 0x7fff) << 5)
-#endif /* ASM_MSIDEF_H */
+#endif /* ASM_X86__MSIDEF_H */