summaryrefslogtreecommitdiffstats
path: root/fs/xfs/linux-2.6/xfs_globals.c
diff options
context:
space:
mode:
authorJens Axboe <jaxboe@fusionio.com>2010-11-16 10:09:42 +0100
committerJens Axboe <jaxboe@fusionio.com>2010-11-16 10:09:42 +0100
commita02056349cdea2252cd2b21643ebf025e83a29f2 (patch)
treeb7c889d6cbe8e7188d07d99a5c9da858c53a5b6c /fs/xfs/linux-2.6/xfs_globals.c
parentblock: export 'ro' sysfs attribute for partitions (diff)
parentLinux 2.6.37-rc2 (diff)
downloadlinux-a02056349cdea2252cd2b21643ebf025e83a29f2.tar.xz
linux-a02056349cdea2252cd2b21643ebf025e83a29f2.zip
Merge branch 'v2.6.37-rc2' into for-2.6.38/core
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_globals.c')
-rw-r--r--fs/xfs/linux-2.6/xfs_globals.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/xfs/linux-2.6/xfs_globals.c b/fs/xfs/linux-2.6/xfs_globals.c
index 2ae8b1ccb02e..76e81cff70b9 100644
--- a/fs/xfs/linux-2.6/xfs_globals.c
+++ b/fs/xfs/linux-2.6/xfs_globals.c
@@ -16,7 +16,6 @@
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "xfs.h"
-#include "xfs_cred.h"
#include "xfs_sysctl.h"
/*