diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-02-14 15:35:28 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-02-14 15:35:28 +1100 |
| commit | f600c997a1e930c3be312fdc4d1a67979d89173e (patch) | |
| tree | 352f5d35d672887a5552730cb71af9d3f068fe19 /fs/nilfs2/inode.c | |
| parent | 065957b017e290977dc5527ae4e21cff9d3fb5ec (diff) | |
| parent | 0ef183f7f162a62662f6002b03bcf3ca2903c937 (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'fs/nilfs2/inode.c')
| -rw-r--r-- | fs/nilfs2/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nilfs2/inode.c b/fs/nilfs2/inode.c index 6b49f14eac8c..1e92930d59c3 100644 --- a/fs/nilfs2/inode.c +++ b/fs/nilfs2/inode.c @@ -25,7 +25,7 @@ #include <linux/gfp.h> #include <linux/mpage.h> #include <linux/writeback.h> -#include <linux/uio.h> +#include <linux/aio.h> #include "nilfs.h" #include "btnode.h" #include "segment.h" |