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

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

diff --git a/include/asm-x86/uaccess.h b/arch/x86/include/asm/uaccess.h
similarity index 99%
rename from include/asm-x86/uaccess.h
rename to arch/x86/include/asm/uaccess.h
index dc8edb5c46593dad80aa46618e9e8fa3ff296152..99192bb55a53bf68afc30efeae89b9b40b5f4b4d 100644 (file)
--- a/include/asm-x86/uaccess.h
+++ b/arch/x86/include/asm/uaccess.h
@@ -1,5 +1,5 @@
-#ifndef _ASM_UACCES_H_
-#define _ASM_UACCES_H_
+#ifndef _ASM_X86_UACCESS_H
+#define _ASM_X86_UACCESS_H
 /*
  * User space memory access functions
  */
@@ -452,5 +452,5 @@ extern struct movsl_mask {
 # include "uaccess_64.h"
 #endif
 
-#endif
+#endif /* _ASM_X86_UACCESS_H */