Merge branch 'linus' into x86/core

[linux-2.6-omap-h63xx.git] / include / asm-x86 / elf.h

diff --git a/include/asm-x86/elf.h b/include/asm-x86/elf.h
index 7be4733c793e58c404fbab54d3c34e2e05ff8aa0..cd678b2d6a7413069cb8bdd115574f45a1c98317 100644 (file)
--- a/include/asm-x86/elf.h
+++ b/include/asm-x86/elf.h
@@ -1,5 +1,5 @@
-#ifndef _ASM_X86_ELF_H
-#define _ASM_X86_ELF_H
+#ifndef ASM_X86__ELF_H
+#define ASM_X86__ELF_H
 
 /*
  * ELF register definitions..
@@ -332,4 +332,4 @@ extern int syscall32_setup_pages(struct linux_binprm *, int exstack);
 extern unsigned long arch_randomize_brk(struct mm_struct *mm);
 #define arch_randomize_brk arch_randomize_brk
 
-#endif
+#endif /* ASM_X86__ELF_H */