diff options
| author | Al Viro | 2015-04-12 04:24:41 +0200 |
|---|---|---|
| committer | Al Viro | 2015-04-12 04:24:41 +0200 |
| commit | c0fec3a98bd6c4d992f191ee1aa0b3599213f3d4 (patch) | |
| tree | 24b4533146ce10bcf4af6fca0971311ece523d58 /fs/ntfs/file.c | |
| parent | NFS: fix BUG() crash in notify_change() with patch to chown_common() (diff) | |
| parent | fs: move struct kiocb to fs.h (diff) | |
| download | kernel-qcow2-linux-c0fec3a98bd6c4d992f191ee1aa0b3599213f3d4.tar.gz kernel-qcow2-linux-c0fec3a98bd6c4d992f191ee1aa0b3599213f3d4.tar.xz kernel-qcow2-linux-c0fec3a98bd6c4d992f191ee1aa0b3599213f3d4.zip | |
Merge branch 'iocb' into for-next
Diffstat (limited to 'fs/ntfs/file.c')
| -rw-r--r-- | fs/ntfs/file.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c index 29139ffb4328..c1da78dad1af 100644 --- a/fs/ntfs/file.c +++ b/fs/ntfs/file.c @@ -28,7 +28,6 @@ #include <linux/swap.h> #include <linux/uio.h> #include <linux/writeback.h> -#include <linux/aio.h> #include <asm/page.h> #include <asm/uaccess.h> |