diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2009-12-06 16:06:11 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2009-12-06 16:06:11 +0100 |
| commit | 64357ed468025614d48daa6cc87674ae5616f8fb (patch) | |
| tree | 2467c239364d7602755b73203025d329c6f84b22 /fs/ocfs2/ocfs2.h | |
| parent | be404f0212ffa8f67361f8ee460a25d901d88991 (diff) | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| download | op-kernel-dev-64357ed468025614d48daa6cc87674ae5616f8fb.zip op-kernel-dev-64357ed468025614d48daa6cc87674ae5616f8fb.tar.gz | |
Merge branch 'master' into for-linus
Diffstat (limited to 'fs/ocfs2/ocfs2.h')
| -rw-r--r-- | fs/ocfs2/ocfs2.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h index eae4046..d963d86 100644 --- 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> -#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" |
