diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-05-02 00:37:39 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-05-02 00:37:39 -0300 |
| commit | dcd93771feab623ff7416c63fc5a5c70e50c4079 (patch) | |
| tree | e8d38c439f57673b4b0d59d679db5952345f2b42 /linux/drivers/media/video/cx18/cx18-driver.h | |
| parent | 21caee2a17a4430d00a96e72f6fcb406ae40295f (diff) | |
| download | mediapointer-dvb-s2-dcd93771feab623ff7416c63fc5a5c70e50c4079.tar.gz mediapointer-dvb-s2-dcd93771feab623ff7416c63fc5a5c70e50c4079.tar.bz2 | |
backport commit aed6abd662c2903733bea7fcd3856c306e650680
From: Mauro Carvalho Chehab <mchehab@infradead.org>
kernel-sync:
Author: Mauro Carvalho Chehab <mchehab@infradead.org>
LD drivers/media/video/built-in.o
drivers/media/video/cx18/built-in.o: In function `get_service_set':
/home/v4l/tokernel/git/drivers/media/video/cx18/cx18-ioctl.c:118: multiple definition of `get_service_set'
drivers/media/video/ivtv/built-in.o:/home/v4l/tokernel/git/drivers/media/video/ivtv/ivtv-ioctl.c:119: first defined here
drivers/media/video/cx18/built-in.o: In function `expand_service_set':
/home/v4l/tokernel/git/drivers/media/video/cx18/cx18-ioctl.c:92: multiple definition of `expand_service_set'
drivers/media/video/ivtv/built-in.o:/home/v4l/tokernel/git/drivers/media/video/ivtv/ivtv-ioctl.c:92: first defined here
drivers/media/video/cx18/built-in.o: In function `service2vbi':
/home/v4l/tokernel/git/drivers/media/video/cx18/cx18-ioctl.c:44: multiple definition of `service2vbi'
drivers/media/video/ivtv/built-in.o:/home/v4l/tokernel/git/drivers/media/video/ivtv/ivtv-ioctl.c:42: first defined here
make[2]: ** [drivers/media/video/built-in.o] Erro 1
make[1]: ** [drivers/media/video] Erro 2
make: ** [drivers/media/] Erro 2
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/cx18/cx18-driver.h')
| -rw-r--r-- | linux/drivers/media/video/cx18/cx18-driver.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/cx18/cx18-driver.h b/linux/drivers/media/video/cx18/cx18-driver.h index 48dffe228..f76e66c0a 100644 --- a/linux/drivers/media/video/cx18/cx18-driver.h +++ b/linux/drivers/media/video/cx18/cx18-driver.h @@ -51,7 +51,7 @@ #include <media/tuner.h> #include "cx18-mailbox.h" #include "cx18-av-core.h" -#include <cx23418.h> +#include "cx23418.h" /* DVB */ #include "demux.h" |