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/nmi.h | |
| parent | 024e8ac04453b3525448c31ef39848cf675ba6db (diff) | |
| parent | 1503af661947b7a4a09355cc2ae6aa0d43f16776 (diff) | |
| download | op-kernel-dev-29308333fbe2cc61258c1c470f9403960428beb2.zip op-kernel-dev-29308333fbe2cc61258c1c470f9403960428beb2.tar.gz | |
Merge branch 'x86/header-guards' into x86/core
Diffstat (limited to 'include/asm-x86/nmi.h')
| -rw-r--r-- | include/asm-x86/nmi.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-x86/nmi.h b/include/asm-x86/nmi.h index 21f8d02..f8b76f3 100644 --- a/include/asm-x86/nmi.h +++ b/include/asm-x86/nmi.h @@ -1,5 +1,5 @@ -#ifndef _ASM_X86_NMI_H_ -#define _ASM_X86_NMI_H_ +#ifndef ASM_X86__NMI_H +#define ASM_X86__NMI_H #include <linux/pm.h> #include <asm/irq.h> @@ -81,4 +81,4 @@ void enable_lapic_nmi_watchdog(void); void stop_nmi(void); void restart_nmi(void); -#endif +#endif /* ASM_X86__NMI_H */ |
