summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSakari Ailus <sakari.ailus@linux.intel.com>2013-12-13 08:58:37 -0300
committerChanho Park <chanho61.park@samsung.com>2014-11-18 11:55:23 +0900
commit01599a324ffd57aa7054da259e3a8b99ec691ca1 (patch)
treee56da27ae7f104cf588c2bb8444f26ecadca194b
parent885956fd6e256653feceb3b00b0d15b40e01db71 (diff)
downloadlinux-3.10-01599a324ffd57aa7054da259e3a8b99ec691ca1.tar.gz
linux-3.10-01599a324ffd57aa7054da259e3a8b99ec691ca1.tar.bz2
linux-3.10-01599a324ffd57aa7054da259e3a8b99ec691ca1.zip
upstream: [media] media: Include linux/kernel.h for DIV_ROUND_UP()
DIV_ROUND_UP() is defined in kernel.h which was not included by media-entity.h. Do exactly that. Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com> Conflicts: include/media/media-entity.h
-rw-r--r--include/media/media-entity.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/media/media-entity.h b/include/media/media-entity.h
index 06bacf937d6..261e0076f2b 100644
--- a/include/media/media-entity.h
+++ b/include/media/media-entity.h
@@ -23,6 +23,7 @@
#ifndef _MEDIA_ENTITY_H
#define _MEDIA_ENTITY_H
+#include <linux/kernel.h>
#include <linux/list.h>
#include <linux/media.h>