diff options
author | Dave Chinner <david@fromorbit.com> | 2014-11-28 04:52:16 +0100 |
---|---|---|
committer | Dave Chinner <david@fromorbit.com> | 2014-11-28 04:52:16 +0100 |
commit | 216875a594e0b4fc72830e3690b8fbe7430738e2 (patch) | |
tree | 4658b9b572333cd8a730a1104ad452764f0e69fe /fs/xfs/xfs_buf.c | |
parent | Merge branch 'xfs-misc-fixes-for-3.19-1' into for-next (diff) | |
parent | xfs: merge xfs_inum.h into xfs_format.h (diff) | |
download | linux-216875a594e0b4fc72830e3690b8fbe7430738e2.tar.xz linux-216875a594e0b4fc72830e3690b8fbe7430738e2.zip |
Merge branch 'xfs-consolidate-format-defs' into for-next
Diffstat (limited to 'fs/xfs/xfs_buf.c')
-rw-r--r-- | fs/xfs/xfs_buf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c index d083889535a2..a4ce39025dcc 100644 --- a/fs/xfs/xfs_buf.c +++ b/fs/xfs/xfs_buf.c @@ -34,10 +34,10 @@ #include <linux/backing-dev.h> #include <linux/freezer.h> +#include "xfs_format.h" #include "xfs_log_format.h" #include "xfs_trans_resv.h" #include "xfs_sb.h" -#include "xfs_ag.h" #include "xfs_mount.h" #include "xfs_trace.h" #include "xfs_log.h" |