summaryrefslogtreecommitdiff
path: root/v4l/Make.config
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-02-17 20:22:30 -0200
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-02-17 20:22:30 -0200
commit198381e2bf6cf71e853c1b0062ec359b7e53bd68 (patch)
tree13c5339bf034956530b5ebe241dc2140dd24cc7a /v4l/Make.config
parent5aea06a41b6e843a69f224d5ead6d0b5f86695ad (diff)
parent900987a1975deef83819b9678a52d6859d67a128 (diff)
downloadmediapointer-dvb-s2-198381e2bf6cf71e853c1b0062ec359b7e53bd68.tar.gz
mediapointer-dvb-s2-198381e2bf6cf71e853c1b0062ec359b7e53bd68.tar.bz2
Merge from mkrufky tree.
Some small updates in the comments for KWorld HardwareMpegTV XPert. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'v4l/Make.config')
-rw-r--r--v4l/Make.config7
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)