]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
media: omap_vout: Fix compile error in 3.1
authorGary Thomas <gary@mlbassoc.com>
Thu, 1 Dec 2011 11:51:09 +0000 (08:51 -0300)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 6 Jan 2012 22:17:08 +0000 (14:17 -0800)
commit d1ee8878a142f81ea1b40d602c6360b752829437 upstream.

This patch is against the mainline v3.1 release (c3b92c8) and
fixes a compile error when building for OMAP3+DSS+VOUT

Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Gary Thomas <gary@mlbassoc.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/media/video/omap/omap_vout.c

index b3a5ecdb33ac00cac5dc3e94ed5cceaabe225655..3422da0034f444e31fb32e4842fd89bb1b153607 100644 (file)
@@ -38,6 +38,7 @@
 #include <linux/irq.h>
 #include <linux/videodev2.h>
 #include <linux/dma-mapping.h>
+#include <linux/slab.h>
 
 #include <media/videobuf-dma-contig.h>
 #include <media/v4l2-device.h>