diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-26 16:28:36 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-26 16:28:36 +0200 |
commit | 29308333fbe2cc61258c1c470f9403960428beb2 (patch) | |
tree | 5bfcfadf2dd2d98c2ad251c96d7ee43a6903819a /include/asm-x86/msidef.h | |
parent | x86_64: fix ia32 AMD syscall audit fast-path (diff) | |
parent | Merge branch 'linus' into x86/header-guards (diff) | |
download | linux-29308333fbe2cc61258c1c470f9403960428beb2.tar.xz linux-29308333fbe2cc61258c1c470f9403960428beb2.zip |
Merge branch 'x86/header-guards' into x86/core
Diffstat (limited to 'include/asm-x86/msidef.h')
-rw-r--r-- | include/asm-x86/msidef.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-x86/msidef.h b/include/asm-x86/msidef.h index 296f29ce426d..3139666a94fa 100644 --- 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. @@ -48,4 +48,4 @@ #define MSI_ADDR_DEST_ID(dest) (((dest) << MSI_ADDR_DEST_ID_SHIFT) & \ MSI_ADDR_DEST_ID_MASK) -#endif /* ASM_MSIDEF_H */ +#endif /* ASM_X86__MSIDEF_H */ |