diff --git a/[refs] b/[refs]
index c09f4a267cc1..55f7231d4d93 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 39d44a51474a52bec6d72d30ebc76f5159101d90
+refs/heads/master: e845c06bced7f5f325e0f9aefd3207cd45c21ff2
diff --git a/trunk/include/asm-x86/asm.h b/trunk/include/asm-x86/asm.h
new file mode 100644
index 000000000000..b5006eb9acba
--- /dev/null
+++ b/trunk/include/asm-x86/asm.h
@@ -0,0 +1,18 @@
+#ifndef _ASM_X86_ASM_H
+#define _ASM_X86_ASM_H
+
+#ifdef CONFIG_X86_32
+/* 32 bits */
+
+# define _ASM_PTR	" .long "
+# define _ASM_ALIGN	" .balign 4 "
+
+#else
+/* 64 bits */
+
+# define _ASM_PTR	" .quad "
+# define _ASM_ALIGN	" .balign 8 "
+
+#endif /* CONFIG_X86_32 */
+
+#endif /* _ASM_X86_ASM_H */