Merge commit 'v2.6.28-rc2' into core/locking

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

diff --git a/include/asm-x86/uaccess_32.h b/arch/x86/include/asm/uaccess_32.h
similarity index 98%
rename from include/asm-x86/uaccess_32.h
rename to arch/x86/include/asm/uaccess_32.h
index d10e842ec3eed2d9cc97fcee885b2cc9be17a0b5..5e06259e90e5a736539948ae22e1de25444ba485 100644 (file)
--- a/include/asm-x86/uaccess_32.h
+++ b/arch/x86/include/asm/uaccess_32.h
@@ -1,5 +1,5 @@
-#ifndef __i386_UACCESS_H
-#define __i386_UACCESS_H
+#ifndef _ASM_X86_UACCESS_32_H
+#define _ASM_X86_UACCESS_32_H
 
 /*
  * User space memory access functions
@@ -215,4 +215,4 @@ long strnlen_user(const char __user *str, long n);
 unsigned long __must_check clear_user(void __user *mem, unsigned long len);
 unsigned long __must_check __clear_user(void __user *mem, unsigned long len);
 
-#endif /* __i386_UACCESS_H */
+#endif /* _ASM_X86_UACCESS_32_H */