summaryrefslogtreecommitdiffstats
path: root/fs/9p
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2015-04-12 04:24:41 +0200
committerAl Viro <viro@zeniv.linux.org.uk>2015-04-12 04:24:41 +0200
commitc0fec3a98bd6c4d992f191ee1aa0b3599213f3d4 (patch)
tree24b4533146ce10bcf4af6fca0971311ece523d58 /fs/9p
parentNFS: fix BUG() crash in notify_change() with patch to chown_common() (diff)
parentfs: move struct kiocb to fs.h (diff)
downloadlinux-c0fec3a98bd6c4d992f191ee1aa0b3599213f3d4.tar.xz
linux-c0fec3a98bd6c4d992f191ee1aa0b3599213f3d4.zip
Merge branch 'iocb' into for-next
Diffstat (limited to 'fs/9p')
-rw-r--r--fs/9p/vfs_addr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/9p/vfs_addr.c b/fs/9p/vfs_addr.c
index eb14e055ea83..ff1a5bac4200 100644
--- a/fs/9p/vfs_addr.c
+++ b/fs/9p/vfs_addr.c
@@ -33,7 +33,7 @@
#include <linux/pagemap.h>
#include <linux/idr.h>
#include <linux/sched.h>
-#include <linux/aio.h>
+#include <linux/uio.h>
#include <net/9p/9p.h>
#include <net/9p/client.h>