Gitweb: http://git.kernel.org/linus/5ba9bb0ef658a7f4c082cdfc4f779729506042f5
Commit: 5ba9bb0ef658a7f4c082cdfc4f779729506042f5
Parent: 815c4163b6c8ebf8152f42b0a5fd015cfdcedc78
Author: Vaibhav Hiremath <hvaibhav@ti.com>
AuthorDate: Thu May 27 08:17:07 2010 -0300
Committer: Mauro Carvalho Chehab <mchehab@redhat.com>
CommitDate: Thu Jul 8 16:48:44 2010 -0300
V4L/DVB: OMAP_VOUT:Build FIX: Rebased against latest DSS2 changes
Changes -
- Kconfig option dependancy changed to ARCH_OMAP2/3 from
ARCH_OMAP24XX/34XX
- There are some moments of function from omap_dss_device
to omap_dss_driver. Incorporated changes for the same.
Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
Signed-off-by: Muralidharan Karicheri <mkaricheri@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---
drivers/media/video/omap/Kconfig | 2 +-
drivers/media/video/omap/omap_vout.c | 35 ++++++++++++++++++---------------
2 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/drivers/media/video/omap/Kconfig b/drivers/media/video/omap/Kconfig
index 97c5394..c1d1933 100644
--- a/drivers/media/video/omap/Kconfig
+++ b/drivers/media/video/omap/Kconfig
@@ -1,6 +1,6 @@
config VIDEO_OMAP2_VOUT
tristate "OMAP2/OMAP3 V4L2-Display driver"
- depends on ARCH_OMAP24XX || ARCH_OMAP34XX
+ depends on ARCH_OMAP2 || ARCH_OMAP3
select VIDEOBUF_GEN
select VIDEOBUF_DMA_SG
select OMAP2_DSS
diff --git a/drivers/media/video/omap/omap_vout.c b/drivers/media/video/omap/omap_vout.c
index e7db055..dfa6826 100644
--- a/drivers/media/video/omap/omap_vout.c
+++ b/drivers/media/video/omap/omap_vout.c
@@ -38,6 +38,7 @@
#include <linux/dma-mapping.h>
#include <linux/irq.h>
#include <linux/videodev2.h>
+#include <linux/slab.h>
#include <media/videobuf-dma-sg.h>
#include <media/v4l2-device.h>
@@ -2488,7 +2489,7 @@ static int omap_vout_remove(struct platform_device *pdev)
for (k = 0; k < vid_dev->num_displays; ...
