diff options
author | Dave Chinner <david@fromorbit.com> | 2014-11-28 14:52:16 +1100 |
---|---|---|
committer | Dave Chinner <david@fromorbit.com> | 2014-11-28 14:52:16 +1100 |
commit | 216875a594e0b4fc72830e3690b8fbe7430738e2 (patch) | |
tree | 4658b9b572333cd8a730a1104ad452764f0e69fe /fs/xfs/xfs_buf_item.c | |
parent | 4bd47c1bf4a64225a855ed77e259eeb37944ba33 (diff) | |
parent | 508b6b3b73888e3296ff638b32f15327e63b7b42 (diff) | |
download | blackbird-op-linux-216875a594e0b4fc72830e3690b8fbe7430738e2.tar.gz blackbird-op-linux-216875a594e0b4fc72830e3690b8fbe7430738e2.zip |
Merge branch 'xfs-consolidate-format-defs' into for-next
Diffstat (limited to 'fs/xfs/xfs_buf_item.c')
-rw-r--r-- | fs/xfs/xfs_buf_item.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_buf_item.c b/fs/xfs/xfs_buf_item.c index f15969543326..3f9bd58edec7 100644 --- a/fs/xfs/xfs_buf_item.c +++ b/fs/xfs/xfs_buf_item.c @@ -17,11 +17,11 @@ */ #include "xfs.h" #include "xfs_fs.h" +#include "xfs_format.h" #include "xfs_log_format.h" #include "xfs_trans_resv.h" #include "xfs_bit.h" #include "xfs_sb.h" -#include "xfs_ag.h" #include "xfs_mount.h" #include "xfs_trans.h" #include "xfs_buf_item.h" |