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/bootparam.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/bootparam.h')
| -rw-r--r-- | include/asm-x86/bootparam.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-x86/bootparam.h b/include/asm-x86/bootparam.h index ae22bdf0ab14..ccf027e2d97d 100644 --- a/include/asm-x86/bootparam.h +++ b/include/asm-x86/bootparam.h @@ -1,5 +1,5 @@ -#ifndef _ASM_BOOTPARAM_H -#define _ASM_BOOTPARAM_H +#ifndef ASM_X86__BOOTPARAM_H +#define ASM_X86__BOOTPARAM_H #include <linux/types.h> #include <linux/screen_info.h> @@ -108,4 +108,4 @@ struct boot_params { __u8 _pad9[276]; /* 0xeec */ } __attribute__((packed)); -#endif /* _ASM_BOOTPARAM_H */ +#endif /* ASM_X86__BOOTPARAM_H */ |