diff options
| author | Patrick Boettcher <pb@linuxtv.org> | 2006-04-17 18:16:47 +0200 |
|---|---|---|
| committer | Patrick Boettcher <pb@linuxtv.org> | 2006-04-17 18:16:47 +0200 |
| commit | 392ad50208a490ee5ee73ac59e809ad366019c00 (patch) | |
| tree | d984365ac21a1d8fd40a49f62781b7e6ae9a78df /linux/drivers/media/video/pvrusb2 | |
| parent | f62b12acad6cf4c6e78bc2dd7e3e445f2d239d24 (diff) | |
| parent | 91263e7de241ee6403c43cd3a13206f749798ba6 (diff) | |
| download | mediapointer-dvb-s2-392ad50208a490ee5ee73ac59e809ad366019c00.tar.gz mediapointer-dvb-s2-392ad50208a490ee5ee73ac59e809ad366019c00.tar.bz2 | |
merge: from master
From: Patrick Boettcher <pb@linuxtv.org>
merge: from master
Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Diffstat (limited to 'linux/drivers/media/video/pvrusb2')
9 files changed, 10 insertions, 10 deletions
diff --git a/linux/drivers/media/video/pvrusb2/Kconfig b/linux/drivers/media/video/pvrusb2/Kconfig index 629dc4e05..207efa6c0 100644 --- a/linux/drivers/media/video/pvrusb2/Kconfig +++ b/linux/drivers/media/video/pvrusb2/Kconfig @@ -1,6 +1,6 @@ config VIDEO_PVRUSB2 tristate "Hauppauge WinTV-PVR USB2 support" - depends on VIDEO_DEV && USB && I2C && EXPERIMENTAL + depends on VIDEO_V4L1 && USB && I2C && EXPERIMENTAL select FW_LOADER select VIDEO_TUNER select VIDEO_TVEEPROM @@ -16,6 +16,8 @@ config VIDEO_PVRUSB2 config VIDEO_PVRUSB2_24XXX bool "Hauppauge WinTV-PVR USB2 support for 24xxx model series" depends on VIDEO_PVRUSB2 && EXPERIMENTAL + select VIDEO_CX25840 + select VIDEO_WM8775 ---help--- This option enables inclusion of additional logic to operate newer WinTV-PVR USB2 devices whose model number is of the diff --git a/linux/drivers/media/video/pvrusb2/Makefile b/linux/drivers/media/video/pvrusb2/Makefile index 53fccce4f..ce78cd00f 100644 --- a/linux/drivers/media/video/pvrusb2/Makefile +++ b/linux/drivers/media/video/pvrusb2/Makefile @@ -15,5 +15,3 @@ pvrusb2-objs := pvrusb2-i2c-core.o pvrusb2-i2c-cmd-v4l2.o \ $(obj-pvrusb2-sysfs-y) $(obj-pvrusb2-debugifc-y) obj-$(CONFIG_VIDEO_PVRUSB2) += pvrusb2.o - -EXTRA_CFLAGS += -I$(src)/.. diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-audio.c b/linux/drivers/media/video/pvrusb2/pvrusb2-audio.c index 7f29a8821..7d5997bdc 100644 --- a/linux/drivers/media/video/pvrusb2/pvrusb2-audio.c +++ b/linux/drivers/media/video/pvrusb2/pvrusb2-audio.c @@ -24,7 +24,7 @@ #include "pvrusb2-audio.h" #include "pvrusb2-hdw-internal.h" #include "pvrusb2-debug.h" -#include <linux/videodev.h> +#include <linux/videodev2.h> #include <media/msp3400.h> #include <media/v4l2-common.h> diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-demod.c b/linux/drivers/media/video/pvrusb2/pvrusb2-demod.c index dca787dfa..f082ecee2 100644 --- a/linux/drivers/media/video/pvrusb2/pvrusb2-demod.c +++ b/linux/drivers/media/video/pvrusb2/pvrusb2-demod.c @@ -26,7 +26,7 @@ #include "pvrusb2-hdw-internal.h" #include "pvrusb2-debug.h" #include "compat.h" -#include <linux/videodev.h> +#include <linux/videodev2.h> #include <media/tuner.h> #include <media/v4l2-common.h> diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c b/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c index b3d2ce926..fb83cd2c9 100644 --- a/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c +++ b/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c @@ -23,7 +23,7 @@ #include "pvrusb2-i2c-cmd-v4l2.h" #include "pvrusb2-hdw-internal.h" #include "pvrusb2-debug.h" -#include <linux/videodev.h> +#include <linux/videodev2.h> #include <linux/videodev2.h> diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-main.c b/linux/drivers/media/video/pvrusb2/pvrusb2-main.c index 40fb6ae41..988f32ad4 100644 --- a/linux/drivers/media/video/pvrusb2/pvrusb2-main.c +++ b/linux/drivers/media/video/pvrusb2/pvrusb2-main.c @@ -29,7 +29,7 @@ #include <linux/moduleparam.h> #include <linux/smp_lock.h> #include <linux/usb.h> -#include <linux/videodev.h> +#include <linux/videodev2.h> #include "pvrusb2-hdw.h" #include "pvrusb2-context.h" diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-tuner.c b/linux/drivers/media/video/pvrusb2/pvrusb2-tuner.c index f829c0acc..8bf7cc142 100644 --- a/linux/drivers/media/video/pvrusb2/pvrusb2-tuner.c +++ b/linux/drivers/media/video/pvrusb2/pvrusb2-tuner.c @@ -26,7 +26,7 @@ #include "pvrusb2-hdw-internal.h" #include "pvrusb2-debug.h" #include "compat.h" -#include <linux/videodev.h> +#include <linux/videodev2.h> #include <media/tuner.h> #include <media/v4l2-common.h> diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c index 56d15c10d..51491e67c 100644 --- a/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c +++ b/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c @@ -30,7 +30,7 @@ #include "pvrusb2-debug.h" #include "pvrusb2-v4l2.h" #include "pvrusb2-ioread.h" -#include <linux/videodev.h> +#include <linux/videodev2.h> #include <media/v4l2-common.h> diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c b/linux/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c index c55f3c653..dde031bb8 100644 --- a/linux/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c +++ b/linux/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c @@ -34,7 +34,7 @@ #include "pvrusb2-hdw-internal.h" #include "pvrusb2-debug.h" -#include <linux/videodev.h> +#include <linux/videodev2.h> #include <media/v4l2-common.h> #include <media/saa7115.h> #include <linux/errno.h> |