Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

[firefly-linux-kernel-4.4.55.git] / fs / ext4 / mballoc.h

diff --git a/fs/ext4/mballoc.h b/fs/ext4/mballoc.h
index 75e34f69215bfb3c24a6ecf9545eace9a36053f7..c96bb19f58f909a7358043d0feddbd8b964a0721 100644 (file)
--- a/fs/ext4/mballoc.h
+++ b/fs/ext4/mballoc.h
@@ -19,7 +19,6 @@
 #include <linux/seq_file.h>
 #include <linux/version.h>
 #include <linux/blkdev.h>
-#include <linux/marker.h>
 #include <linux/mutex.h>
 #include "ext4_jbd2.h"
 #include "ext4.h"