Merge branch 'linus' into stackprotector

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

diff --git a/include/asm-x86/pda.h b/arch/x86/include/asm/pda.h
similarity index 98%
rename from include/asm-x86/pda.h
rename to arch/x86/include/asm/pda.h
index 45fd2aee8d6a7306f5967ef84d378c79f29ca6d8..3fea2fdb330294b7dfc68603565b20654182bdfa 100644 (file)
--- a/include/asm-x86/pda.h
+++ b/arch/x86/include/asm/pda.h
@@ -1,5 +1,5 @@
-#ifndef ASM_X86__PDA_H
-#define ASM_X86__PDA_H
+#ifndef _ASM_X86_PDA_H
+#define _ASM_X86_PDA_H
 
 #ifndef __ASSEMBLY__
 #include <linux/stddef.h>
@@ -134,4 +134,4 @@ do {                                                                        \
 
 #define refresh_stack_canary() write_pda(stack_canary, current->stack_canary)
 
-#endif /* ASM_X86__PDA_H */
+#endif /* _ASM_X86_PDA_H */