diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2015-04-11 22:24:41 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2015-04-11 22:24:41 -0400 |
| commit | c0fec3a98bd6c4d992f191ee1aa0b3599213f3d4 (patch) | |
| tree | 24b4533146ce10bcf4af6fca0971311ece523d58 /fs/xfs/xfs_aops.c | |
| parent | c1b8940b42bb6487b10f2267a96b486276ce9ff7 (diff) | |
| parent | e2e40f2c1ed433c5e224525c8c862fd32e5d3df2 (diff) | |
Merge branch 'iocb' into for-next
Diffstat (limited to 'fs/xfs/xfs_aops.c')
| -rw-r--r-- | fs/xfs/xfs_aops.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c index 3a9b7a1b8704..4f8cdc59bc38 100644 --- a/fs/xfs/xfs_aops.c +++ b/fs/xfs/xfs_aops.c | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | #include "xfs_bmap.h" | 31 | #include "xfs_bmap.h" |
| 32 | #include "xfs_bmap_util.h" | 32 | #include "xfs_bmap_util.h" |
| 33 | #include "xfs_bmap_btree.h" | 33 | #include "xfs_bmap_btree.h" |
| 34 | #include <linux/aio.h> | ||
| 35 | #include <linux/gfp.h> | 34 | #include <linux/gfp.h> |
| 36 | #include <linux/mpage.h> | 35 | #include <linux/mpage.h> |
| 37 | #include <linux/pagevec.h> | 36 | #include <linux/pagevec.h> |