Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6

[linux-2.6] / fs / ext4 / xattr_trusted.c

diff --git a/fs/ext4/xattr_trusted.c b/fs/ext4/xattr_trusted.c
index 11bd58c95a61b9b22f0734ea56e2e5f98f119ed1..e0f05acdafece0e0826c2985fc0a59c556fa5159 100644 (file)
--- a/fs/ext4/xattr_trusted.c
+++ b/fs/ext4/xattr_trusted.c
@@ -9,8 +9,7 @@
 #include <linux/string.h>
 #include <linux/capability.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"