diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-02-17 20:17:07 -0200 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-02-17 20:17:07 -0200 |
commit | 486f78155d9fcea056a786ee3bf10df019adfa7c (patch) | |
tree | 1d14b7d2f4e06d601e4ad99e8b80d14e26ab0784 /v4l/Make.config | |
parent | 524bf4cc08d65dec6123e1d85f51edb89fae9d02 (diff) | |
parent | 5ea064de62f132e1a75140226ec2b1e5cba1e45e (diff) | |
download | mediapointer-dvb-s2-486f78155d9fcea056a786ee3bf10df019adfa7c.tar.gz mediapointer-dvb-s2-486f78155d9fcea056a786ee3bf10df019adfa7c.tar.bz2 |
Merge from mkrufky ivtv-merge tree.
Added a command, 'make ivtv' that will retrieve the latest ivtv
sources from ivtvdriver.org using subversion, and build the driver along
with the rest of the v4l-dvb tree.
Acked-by: Hans Verkuil <hverkuil@xs4all.nl>
Acked-by: Mike Isely <isely@pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'v4l/Make.config')
-rw-r--r-- | v4l/Make.config | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/v4l/Make.config b/v4l/Make.config index f8978c53b..216674ce2 100644 --- a/v4l/Make.config +++ b/v4l/Make.config @@ -22,6 +22,10 @@ CONFIG_VIDEO_ADV_DEBUG := y CONFIG_VIDEO_PVRUSB2 := n +CONFIG_VIDEO_IVTV := n + +CONFIG_DVB_FIRESAT := n + # doesn't build on older kernels CONFIG_DVB_CORE := n @@ -58,7 +62,6 @@ CONFIG_DVB_TTUSB_BUDGET := n CONFIG_DVB_TTUSB_DEC := n CONFIG_VIDEO_SAA7146 := n CONFIG_VIDEO_SAA7146_VV := n -CONFIG_DVB_FIRESAT := n ifneq ($(KERNELRELEASE),) CONFIG_DVB_CORE := $(shell test $(SUBLEVEL) -ge 10 -a $(PATCHLEVEL) -ge 6 && echo m) @@ -106,3 +109,5 @@ ifeq ($(CONFIG_DVB_CORE),m) CONFIG_VIDEO_SAA7146_VV := m endif +CONFIG_VIDEO_IVTV := $(if $(wildcard $(src)/ivtv-svnversion.h),m) +CONFIG_VIDEO_PVRUSB2 := $(if $(wildcard $(src)/.pvrusb2-merge),m) |