diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2015-04-09 00:00:30 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2015-04-09 00:01:38 -0400 |
| commit | 237dae889051ed4ebf438b08ca6c0e7c54b97774 (patch) | |
| tree | 0cbd9882d28f19875f5c1daf1698edaac985de0f /fs/affs/file.c | |
| parent | 7abccdba25be45630eede85053496f1f48d36ec8 (diff) | |
| parent | e2e40f2c1ed433c5e224525c8c862fd32e5d3df2 (diff) | |
| download | op-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/file.c')
| -rw-r--r-- | fs/affs/file.c | 2 |
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); |
