aboutsummaryrefslogtreecommitdiff
path: root/fs/xfs/xfs_inode.c
diff options
context:
space:
mode:
authorFelix Blyakher <felixb@sgi.com>2009-06-11 16:56:49 -0500
committerFelix Blyakher <felixb@sgi.com>2009-06-11 16:56:49 -0500
commit35fd035968de4f674b9d62ee7b1d80ab7a50c384 (patch)
tree53a936ecdf8e9c59735fa4e7794ccb503b06d5d5 /fs/xfs/xfs_inode.c
parent4e73e0eb633f8a1b5cbf20e7f42c6dbfec1d1ca7 (diff)
parentef14f0c1578dce4b688726eb2603e50b62d6665a (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/fs/xfs/xfs
Diffstat (limited to 'fs/xfs/xfs_inode.c')
-rw-r--r--fs/xfs/xfs_inode.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index 123b20c8cbf..1f22d65fed0 100644
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -49,7 +49,6 @@
#include "xfs_utils.h"
#include "xfs_dir2_trace.h"
#include "xfs_quota.h"
-#include "xfs_acl.h"
#include "xfs_filestream.h"
#include "xfs_vnodeops.h"