The patch number 8802 was added via Mauro Carvalho Chehab <[EMAIL PROTECTED]>
to http://linuxtv.org/hg/v4l-dvb master development tree.

Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel

If anyone has any objections, please let us know by sending a message to:
        [EMAIL PROTECTED]

------

From: Mauro Carvalho Chehab  <[EMAIL PROTECTED]>
merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvb




Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]>


---

 linux/drivers/media/video/Kconfig   |    2 +-
 linux/drivers/media/video/mt9m111.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff -r e2196aab3e6a -r c7d8eeb5f548 linux/drivers/media/video/Kconfig
--- a/linux/drivers/media/video/Kconfig Fri Aug 29 20:16:31 2008 +0200
+++ b/linux/drivers/media/video/Kconfig Fri Aug 29 18:40:09 2008 -0300
@@ -822,7 +822,7 @@ config VIDEO_PXA27x
 
 config VIDEO_SH_MOBILE_CEU
        tristate "SuperH Mobile CEU Interface driver"
-       depends on VIDEO_DEV && SOC_CAMERA
+       depends on VIDEO_DEV && SOC_CAMERA && HAS_DMA
        select VIDEOBUF_DMA_CONTIG
        ---help---
          This is a v4l2 driver for the SuperH Mobile CEU Interface
diff -r e2196aab3e6a -r c7d8eeb5f548 linux/drivers/media/video/mt9m111.c
--- a/linux/drivers/media/video/mt9m111.c       Fri Aug 29 20:16:31 2008 +0200
+++ b/linux/drivers/media/video/mt9m111.c       Fri Aug 29 18:40:09 2008 -0300
@@ -755,7 +755,7 @@ static int mt9m111_set_control(struct so
        return ret;
 }
 
-int mt9m111_restore_state(struct soc_camera_device *icd)
+static int mt9m111_restore_state(struct soc_camera_device *icd)
 {
        struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
 


---

Patch is available at: 
http://linuxtv.org/hg/v4l-dvb/rev/c7d8eeb5f5489349dc81a9923a002135e4cf271b

_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits

Reply via email to