diff options
author | Ingo Molnar | 2008-10-06 16:15:57 +0200 |
---|---|---|
committer | Ingo Molnar | 2008-10-06 16:15:57 +0200 |
commit | b8cd9d056bbc5f2630ab1787dbf76f83bbb517c0 (patch) | |
tree | a49c776b88db5346eaef6082c271f5d79319654f /include/asm-x86/efi.h | |
parent | Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
parent | Merge branch 'linus' into x86/header-guards (diff) | |
download | kernel-qcow2-linux-b8cd9d056bbc5f2630ab1787dbf76f83bbb517c0.tar.gz kernel-qcow2-linux-b8cd9d056bbc5f2630ab1787dbf76f83bbb517c0.tar.xz kernel-qcow2-linux-b8cd9d056bbc5f2630ab1787dbf76f83bbb517c0.zip |
Merge branch 'x86/header-guards' into x86-v28-for-linus-phase1
Conflicts:
include/asm-x86/dma-mapping.h
include/asm-x86/gpio.h
include/asm-x86/idle.h
include/asm-x86/kvm_host.h
include/asm-x86/namei.h
include/asm-x86/uaccess.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/efi.h')
-rw-r--r-- | include/asm-x86/efi.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-x86/efi.h b/include/asm-x86/efi.h index d4f2b0abe929..ed2de22e8705 100644 --- a/include/asm-x86/efi.h +++ b/include/asm-x86/efi.h @@ -1,5 +1,5 @@ -#ifndef _ASM_X86_EFI_H -#define _ASM_X86_EFI_H +#ifndef ASM_X86__EFI_H +#define ASM_X86__EFI_H #ifdef CONFIG_X86_32 @@ -94,4 +94,4 @@ extern void efi_reserve_early(void); extern void efi_call_phys_prelog(void); extern void efi_call_phys_epilog(void); -#endif +#endif /* ASM_X86__EFI_H */ |