diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-04-27 10:29:01 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-04-27 10:29:01 -0300 |
| commit | 9a2bbcda776b51c070c6859a114fb00b06f1e392 (patch) | |
| tree | e0f367a91ae7ba0948470e0a993233dfd6372666 | |
| parent | 1aadc904874b153386bc286fba17fb0f73a6e355 (diff) | |
| download | mediapointer-dvb-s2-9a2bbcda776b51c070c6859a114fb00b06f1e392.tar.gz mediapointer-dvb-s2-9a2bbcda776b51c070c6859a114fb00b06f1e392.tar.bz2 | |
Make bt866 and ks0127 work at V4L/DVB tree
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| -rw-r--r-- | linux/Documentation/video4linux/Zoran | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/bt866.c | 1 | ||||
| -rw-r--r-- | linux/drivers/media/video/ks0127.h | 1 | ||||
| -rw-r--r-- | v4l/versions.txt | 1 |
4 files changed, 4 insertions, 1 deletions
diff --git a/linux/Documentation/video4linux/Zoran b/linux/Documentation/video4linux/Zoran index e82f629e5..040a2c841 100644 --- a/linux/Documentation/video4linux/Zoran +++ b/linux/Documentation/video4linux/Zoran @@ -39,7 +39,7 @@ AverMedia 6 Eyes AVS6EYES: * Samsung ks0127 TV decoder * Conexant bt866 TV encoder Drivers to use: videodev, i2c-core, i2c-algo-bit, - videocodec, ks0127, bt866, zr36060, zr36067 + videocodec, ks0127, bt866, zr36060, zr36067 Inputs/outputs: Six physical inputs. 1-6 are composite, 1-2, 3-4, 5-6 doubles as S-video, 1-3 triples as component. diff --git a/linux/drivers/media/video/bt866.c b/linux/drivers/media/video/bt866.c index 05e42bbcf..64f21c0a2 100644 --- a/linux/drivers/media/video/bt866.c +++ b/linux/drivers/media/video/bt866.c @@ -46,6 +46,7 @@ #include <linux/types.h> #include <linux/i2c.h> +#include "compat.h" #include <linux/videodev.h> #include <asm/uaccess.h> diff --git a/linux/drivers/media/video/ks0127.h b/linux/drivers/media/video/ks0127.h index 1ec578833..841717a21 100644 --- a/linux/drivers/media/video/ks0127.h +++ b/linux/drivers/media/video/ks0127.h @@ -24,6 +24,7 @@ #ifndef KS0127_H #define KS0127_H +#include "compat.h" #include <linux/videodev.h> /* input channels */ diff --git a/v4l/versions.txt b/v4l/versions.txt index 1d4209680..886f76fde 100644 --- a/v4l/versions.txt +++ b/v4l/versions.txt @@ -19,6 +19,7 @@ USB_ET61X251 USB_PWC USB_PWC_DEBUG USB_ZC0301 +VIDEO_ZORAN_AVS6EYES [2.6.14] VIDEO_ZORAN |