summaryrefslogtreecommitdiffstats
path: root/fs/affs
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2015-04-09 00:00:30 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2015-04-09 00:01:38 -0400
commit237dae889051ed4ebf438b08ca6c0e7c54b97774 (patch)
tree0cbd9882d28f19875f5c1daf1698edaac985de0f /fs/affs
parent7abccdba25be45630eede85053496f1f48d36ec8 (diff)
parente2e40f2c1ed433c5e224525c8c862fd32e5d3df2 (diff)
downloadop-kernel-dev-237dae889051ed4ebf438b08ca6c0e7c54b97774.zip
op-kernel-dev-237dae889051ed4ebf438b08ca6c0e7c54b97774.tar.gz
Merge branch 'iocb' into for-davem
trivial conflict in net/socket.c and non-trivial one in crypto - that one had evaded aio_complete() removal. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/affs')
-rw-r--r--fs/affs/file.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/affs/file.c b/fs/affs/file.c
index a91795e..3aa7eb6 100644
--- a/fs/affs/file.c
+++ b/fs/affs/file.c
@@ -12,7 +12,7 @@
* affs regular file handling primitives
*/
-#include <linux/aio.h>
+#include <linux/uio.h>
#include "affs.h"
static struct buffer_head *affs_get_extblock_slow(struct inode *inode, u32 ext);
OpenPOWER on IntegriCloud