Re: linux-next: Tree for May 4 (staging/dt3155v4l) [PATCH]

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Marin Mitov
Date: Wednesday, May 5, 2010 - 10:31 am

On Tuesday 04 May 2010 10:42:08 pm Randy Dunlap wrote:
It's my fault, sorry.

Here is a patch solving the problem. Compiles with Randy's config, but does not link

drivers/staging/built-in.o: In function `format_by_fourcc':
(.text+0x211da): multiple definition of `format_by_fourcc'
drivers/media/built-in.o:(.text+0x2a744): first defined here

drivers/media/common/saa7146_video.c:struct saa7146_format* format_by_fourcc(struct saa7146_dev *dev, int fourcc)
drivers/staging/cx25821/cx25821-video.c:struct cx25821_fmt *format_by_fourcc(unsigned int fourcc)

Marin MItov

=========================================

[PATCH] Adding the missing linux/delay.h

The prototypes of udelay() and msleep() are in linux/delay.h,
so include it.

Signed-off-by: Marin Mitov <mitov@issp.bas.bg>

==========================================================================
--- a/drivers/staging/dt3155v4l/dt3155v4l.c	2010-05-05 08:55:30.000000000 +0300
+++ b/drivers/staging/dt3155v4l/dt3155v4l.c	2010-05-05 08:57:00.000000000 +0300
@@ -4,6 +4,7 @@
 #include <linux/pci.h>
 #include <linux/version.h>
 #include <linux/stringify.h>
+#include <linux/delay.h>
 #include <media/videobuf-dma-contig.h>
 #include <linux/kthread.h>
 
--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
linux-next: Tree for May 4, Stephen Rothwell, (Mon May 3, 11:23 pm)
Re: linux-next: Tree for May 4 (media &amp; IR), Randy Dunlap, (Tue May 4, 11:26 am)
Re: linux-next: Tree for May 4 (staging/dt3155v4l), Randy Dunlap, (Tue May 4, 11:36 am)
Re: linux-next: Tree for May 4 (staging/dt3155v4l), Randy Dunlap, (Tue May 4, 12:42 pm)
Re: linux-next: Tree for May 4 (staging/dt3155v4l) [PATCH], Marin Mitov, (Wed May 5, 10:31 am)