Merge branch 'drm-next-3.18' of git://people.freedesktop.org/~agd5f/linux into drm...

[karo-tx-linux.git] / fs / coda / coda_linux.c

diff --git a/fs/coda/coda_linux.c b/fs/coda/coda_linux.c
index 2849f41e72a209fb689c7b28915566ed8c70cde1..1326d38960db0de7dc234f44c981f7d7eeeaa498 100644 (file)
--- a/fs/coda/coda_linux.c
+++ b/fs/coda/coda_linux.c
@@ -13,7 +13,7 @@
 #include <linux/fs.h>
 #include <linux/stat.h>
 #include <linux/errno.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 #include <linux/string.h>
 
 #include <linux/coda.h>