summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorGary Thomas <gary@mlbassoc.com>2011-12-01 08:51:09 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-12-11 09:08:32 -0200
commitd1ee8878a142f81ea1b40d602c6360b752829437 (patch)
tree5a63f5a9a0ddcf3b533e6e053cd52153350fbaa0 /drivers/media
parent6b536a6ca52ae12b5378de6fb5da305a3c54dbd8 (diff)
downloadtalos-obmc-linux-d1ee8878a142f81ea1b40d602c6360b752829437.tar.gz
talos-obmc-linux-d1ee8878a142f81ea1b40d602c6360b752829437.zip
[media] omap_vout: Fix compile error in 3.1
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> Cc: stable@kernel.org Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/omap/omap_vout.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/video/omap/omap_vout.c b/drivers/media/video/omap/omap_vout.c
index 2d2a136e465e..ee0d0b39cd17 100644
--- a/drivers/media/video/omap/omap_vout.c
+++ b/drivers/media/video/omap/omap_vout.c
@@ -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>
OpenPOWER on IntegriCloud