summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/omap3isp/ispccdc.c
diff options
context:
space:
mode:
authorFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>2011-10-15 02:14:01 +0200
committerFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>2011-10-15 02:14:01 +0200
commit07aaae44f5a3962c3a410a6dd7936dfa7dece2b9 (patch)
tree0cdb5735800ddd63d8850aa26d3a3f1f3334267a /drivers/media/video/omap3isp/ispccdc.c
parentdrivers/video: fsl-diu-fb: merge diu_pool into fsl_diu_data (diff)
parentLinux 3.1-rc9 (diff)
downloadlinux-07aaae44f5a3962c3a410a6dd7936dfa7dece2b9.tar.xz
linux-07aaae44f5a3962c3a410a6dd7936dfa7dece2b9.zip
Merge commit 'v3.1-rc9' into fbdev-next
Diffstat (limited to 'drivers/media/video/omap3isp/ispccdc.c')
-rw-r--r--drivers/media/video/omap3isp/ispccdc.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/video/omap3isp/ispccdc.c b/drivers/media/video/omap3isp/ispccdc.c
index 9d3459de04b2..80796eb0c53e 100644
--- a/drivers/media/video/omap3isp/ispccdc.c
+++ b/drivers/media/video/omap3isp/ispccdc.c
@@ -31,6 +31,7 @@
#include <linux/dma-mapping.h>
#include <linux/mm.h>
#include <linux/sched.h>
+#include <linux/slab.h>
#include <media/v4l2-event.h>
#include "isp.h"