Merge branch 'staging-next' into Linux 3.1

[pandora-kernel.git] / arch / x86 / include / asm / shmparam.h

diff --git a/arch/x86/include/asm/shmparam.h b/arch/x86/include/asm/shmparam.h
index a83a1fd..0880cf0 100644 (file)
--- a/arch/x86/include/asm/shmparam.h
+++ b/arch/x86/include/asm/shmparam.h
@@ -1,6 +1,6 @@
-#ifndef ASM_X86__SHMPARAM_H
-#define ASM_X86__SHMPARAM_H
+#ifndef _ASM_X86_SHMPARAM_H
+#define _ASM_X86_SHMPARAM_H
 
 #define SHMLBA PAGE_SIZE        /* attach addr a multiple of this */
 
-#endif /* ASM_X86__SHMPARAM_H */
+#endif /* _ASM_X86_SHMPARAM_H */