Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / fs / ext4 / xattr_user.c

diff --git a/fs/ext4/xattr_user.c b/fs/ext4/xattr_user.c
index 9c5a665e0837c0fcc2ec5551aea8b7481b0271d0..7ed3d8ebf09686d2315e3a1ebdc92ccff5ada1ad 100644 (file)
--- a/fs/ext4/xattr_user.c
+++ b/fs/ext4/xattr_user.c
@@ -8,8 +8,7 @@
 #include <linux/module.h>
 #include <linux/string.h>
 #include <linux/fs.h>
-#include <linux/smp_lock.h>
-#include <linux/ext4_jbd.h>
+#include <linux/ext4_jbd2.h>
 #include <linux/ext4_fs.h>
 #include "xattr.h"