Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

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

diff --git a/include/asm-x86/syscall.h b/arch/x86/include/asm/syscall.h
similarity index 98%
rename from include/asm-x86/syscall.h
rename to arch/x86/include/asm/syscall.h
index ec2a95e68e4249fc705ddb60ad1f2e34fff9aba0..d82f39bb7905e8f14d3cbd1dc0365ba98f03eea6 100644 (file)
--- a/include/asm-x86/syscall.h
+++ b/arch/x86/include/asm/syscall.h
@@ -10,8 +10,8 @@
  * See asm-generic/syscall.h for descriptions of what we must do here.
  */
 
-#ifndef _ASM_SYSCALL_H
-#define _ASM_SYSCALL_H 1
+#ifndef _ASM_X86_SYSCALL_H
+#define _ASM_X86_SYSCALL_H
 
 #include <linux/sched.h>
 #include <linux/err.h>
@@ -210,4 +210,4 @@ static inline void syscall_set_arguments(struct task_struct *task,
 
 #endif /* CONFIG_X86_32 */
 
-#endif /* _ASM_SYSCALL_H */
+#endif /* _ASM_X86_SYSCALL_H */