Merge branch 'master' into upstream

[deliverable/linux.git] / fs / inode.c

diff --git a/fs/inode.c b/fs/inode.c
index a6d60682f0fd861757df6991ff8038c8ee38b7f4..ae2727ab0c3ab7695b14f256da0bccdfd3668d81 100644 (file)
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -24,6 +24,7 @@
 #include <linux/mount.h>
 #include <linux/async.h>
 #include <linux/posix_acl.h>
+#include <linux/ima.h>
 
 /*
  * This is needed for the following functions: