diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-23 16:11:54 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-23 16:11:54 -0300 |
| commit | 8587142fb31bbbc156e4e1ecd758e2c0fe5eb2bf (patch) | |
| tree | 472c338929bdcb87f76a7824bf1602378ab34d03 /linux/drivers/media/video/pvrusb2 | |
| parent | 27db32c1fbbd03a1427f7b783dcc7eee372c953e (diff) | |
| parent | 47e7619ed0e11061799a387d580aa2aa90561ead (diff) | |
| download | mediapointer-dvb-s2-8587142fb31bbbc156e4e1ecd758e2c0fe5eb2bf.tar.gz mediapointer-dvb-s2-8587142fb31bbbc156e4e1ecd758e2c0fe5eb2bf.tar.bz2 | |
merge: http://linuxtv.org/hg/~hverkuil/mpeg-api
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/pvrusb2')
| -rw-r--r-- | linux/drivers/media/video/pvrusb2/Kconfig | 1 | ||||
| -rw-r--r-- | linux/drivers/media/video/pvrusb2/pvrusb2-encoder.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/linux/drivers/media/video/pvrusb2/Kconfig b/linux/drivers/media/video/pvrusb2/Kconfig index 4a7f88484..298b1c71a 100644 --- a/linux/drivers/media/video/pvrusb2/Kconfig +++ b/linux/drivers/media/video/pvrusb2/Kconfig @@ -4,6 +4,7 @@ config VIDEO_PVRUSB2 select FW_LOADER select VIDEO_TUNER select VIDEO_TVEEPROM + select VIDEO_CX2341X select VIDEO_SAA711X select VIDEO_MSP3400 ---help--- diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-encoder.c b/linux/drivers/media/video/pvrusb2/pvrusb2-encoder.c index 6c66e258f..958500466 100644 --- a/linux/drivers/media/video/pvrusb2/pvrusb2-encoder.c +++ b/linux/drivers/media/video/pvrusb2/pvrusb2-encoder.c @@ -20,8 +20,10 @@ * */ +#include "compat.h" #include <linux/device.h> // for linux/firmware.h #include <linux/firmware.h> +#include <linux/videodev2.h> #include <media/cx2341x.h> #include "pvrusb2-util.h" #include "pvrusb2-encoder.h" diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c index 333419d6f..409343097 100644 --- a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c +++ b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c @@ -25,6 +25,7 @@ #include <linux/slab.h> #include <linux/firmware.h> #include <asm/semaphore.h> +#include <linux/videodev2.h> #include <media/cx2341x.h> #include "pvrusb2.h" #include "pvrusb2-std.h" |