diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-04-07 11:03:59 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-04-07 11:03:59 -0300 |
| commit | 87aa8ec14871776573c7097a7ae09672c25f4953 (patch) | |
| tree | a6a607a4d0c8685caead0e9a8fdd149122008afe /linux/drivers/media/video/pvrusb2 | |
| parent | b4171f226d40012c3e7510850dc43bc503adf0c7 (diff) | |
| parent | c6d961cb656bbd8d45f75563328123f0c2935157 (diff) | |
| download | mediapointer-dvb-s2-87aa8ec14871776573c7097a7ae09672c25f4953.tar.gz mediapointer-dvb-s2-87aa8ec14871776573c7097a7ae09672c25f4953.tar.bz2 | |
merge from http://linuxtv.org/hg/~quincy/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
merge:
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 | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/pvrusb2/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/pvrusb2/Kconfig b/linux/drivers/media/video/pvrusb2/Kconfig index 629dc4e05..89031a2f5 100644 --- a/linux/drivers/media/video/pvrusb2/Kconfig +++ b/linux/drivers/media/video/pvrusb2/Kconfig @@ -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)/.. |