aboutsummaryrefslogtreecommitdiff
path: root/include/asm-x86/mman.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-10-06 16:15:57 +0200
committerIngo Molnar <mingo@elte.hu>2008-10-06 16:15:57 +0200
commitb8cd9d056bbc5f2630ab1787dbf76f83bbb517c0 (patch)
treea49c776b88db5346eaef6082c271f5d79319654f /include/asm-x86/mman.h
parentfec6ed1d1f9b78a6acb4a3eb2c46c812ac2e96f0 (diff)
parent1503af661947b7a4a09355cc2ae6aa0d43f16776 (diff)
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/mman.h')
-rw-r--r--include/asm-x86/mman.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-x86/mman.h b/include/asm-x86/mman.h
index 90bc4108a4f..4ef28e6de38 100644
--- a/include/asm-x86/mman.h
+++ b/include/asm-x86/mman.h
@@ -1,5 +1,5 @@
-#ifndef _ASM_X86_MMAN_H
-#define _ASM_X86_MMAN_H
+#ifndef ASM_X86__MMAN_H
+#define ASM_X86__MMAN_H
#include <asm-generic/mman.h>
@@ -17,4 +17,4 @@
#define MCL_CURRENT 1 /* lock all current mappings */
#define MCL_FUTURE 2 /* lock all future mappings */
-#endif /* _ASM_X86_MMAN_H */
+#endif /* ASM_X86__MMAN_H */