Merge remote-tracking branch 'mkp-scsi/4.10/scsi-fixes' into fixes

[linux-2.6-block.git] / kernel / futex_compat.c

diff --git a/kernel/futex_compat.c b/kernel/futex_compat.c
index 4ae3232e7a28a507d5ba316d9603c4275012a7ad..3f409968e4666e7d9252d0b7602253dfc853fc75 100644 (file)
--- a/kernel/futex_compat.c
+++ b/kernel/futex_compat.c
@@ -13,7 +13,7 @@
 #include <linux/ptrace.h>
 #include <linux/syscalls.h>
 
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 
 
 /*