Merge 3.14-rc7 into staging-next

[cascardo/linux.git] / include / media / media-entity.h

diff --git a/include/media/media-entity.h b/include/media/media-entity.h
index 10df551..e004591 100644 (file)
--- a/include/media/media-entity.h
+++ b/include/media/media-entity.h
@@ -24,6 +24,7 @@
 #define _MEDIA_ENTITY_H
 
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 #include <linux/list.h>
 #include <linux/media.h>