Merge branch 'master' into for-next

[~andy/linux] / fs / omfs / inode.c

diff --git a/fs/omfs/inode.c b/fs/omfs/inode.c
index 2ff33ea5cb347a4304be79700e4a9b2a1754b34c..b44bb835e8eaa3e8767193fe0a1296d3ee7eefde 100644 (file)
--- a/fs/omfs/inode.c
+++ b/fs/omfs/inode.c
@@ -5,6 +5,7 @@
  */
 #include <linux/module.h>
 #include <linux/sched.h>
+#include <linux/slab.h>
 #include <linux/fs.h>
 #include <linux/vfs.h>
 #include <linux/parser.h>