Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec...

[sfrench/cifs-2.6.git] / fs / ocfs2 / ocfs2.h

diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h
index 35ad46cf89b31f6a90edf1ad94bbd506e9ef7d20..9362eea7424be2421b461b76032d85733573c731 100644 (file)
--- a/fs/ocfs2/ocfs2.h
+++ b/fs/ocfs2/ocfs2.h
@@ -35,12 +35,7 @@
 #include <linux/kref.h>
 #include <linux/mutex.h>
 #include <linux/lockdep.h>
 #include <linux/kref.h>
 #include <linux/mutex.h>
 #include <linux/lockdep.h>

-#ifndef CONFIG_OCFS2_COMPAT_JBD
-# include <linux/jbd2.h>
-#else
-# include <linux/jbd.h>
-# include "ocfs2_jbd_compat.h"
-#endif
+#include <linux/jbd2.h>

 
 /* For union ocfs2_dlm_lksb */
 #include "stackglue.h"
 
 /* For union ocfs2_dlm_lksb */
 #include "stackglue.h"