Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next

[~andy/linux] / fs / ocfs2 / locks.c

diff --git a/fs/ocfs2/locks.c b/fs/ocfs2/locks.c
index b5cb3ede9408944d99abc7c7c3b28c01b1ddadeb..e57c804069ea6487c0a8eba6d203f88ccd8dd39a 100644 (file)
--- a/fs/ocfs2/locks.c
+++ b/fs/ocfs2/locks.c
@@ -26,7 +26,6 @@
 #include <linux/fs.h>
 #include <linux/fcntl.h>
 
-#define MLOG_MASK_PREFIX ML_INODE
 #include <cluster/masklog.h>
 
 #include "ocfs2.h"