21_video_config

PATCH New Gerd Knorr 1 participant 1 message Apr 2, 2003 Media (V4L/DVB)

lore

Share & tools

lore

Gerd Knorr

author

2003-04-02 16:18 UTC #0 lore raw

PATCH 1/1 21_video_config

Hi,

This patch adds a few new config options for modules which are shared by multiple video4linux drivers (bttv * saa7134). This simplifies the Makefiles and also prepares the merge of Michael's saa7146 driver which will also use these modules.

Gerd

drivers/media/Kconfig +14 -0

diff -u linux-2.5.66/drivers/media/Kconfig linux/drivers/media/Kconfig
@@ -32,5 +32,19 @@
 
 source "drivers/media/dvb/Kconfig"
 
+# source "drivers/media/common/Kconfig"
+
+config VIDEO_TUNER
+	tristate
+	default y if VIDEO_BT848=y || VIDEO_SAA7134=y
+	default m if VIDEO_BT848=m || VIDEO_SAA7134=m
+	depends on VIDEO_DEV
+
+config VIDEO_BUF
+	tristate
+	default y if VIDEO_BT848=y || VIDEO_SAA7134=y
+	default m if VIDEO_BT848=m || VIDEO_SAA7134=m
+	depends on VIDEO_DEV
+
 endmenu

drivers/media/video/Makefile +5 -2

diff -u linux-2.5.66/drivers/media/video/Makefile linux/drivers/media/video/Makefile
@@ -9,7 +9,7 @@
 obj-$(CONFIG_VIDEO_DEV) += videodev.o v4l2-common.o v4l1-compat.o
 
 obj-$(CONFIG_VIDEO_BT848) += bttv.o msp3400.o tvaudio.o \
-	tda7432.o tda9875.o tuner.o video-buf.o tda9887.o
+	tda7432.o tda9875.o
 obj-$(CONFIG_SOUND_TVMIXER) += tvmixer.o
 
 obj-$(CONFIG_VIDEO_ZR36120) += zoran.o

@@ -29,5 +29,8 @@
 obj-$(CONFIG_VIDEO_CPIA_PP) += cpia_pp.o
 obj-$(CONFIG_VIDEO_CPIA_USB) += cpia_usb.o
 obj-$(CONFIG_VIDEO_MEYE) += meye.o
-obj-$(CONFIG_VIDEO_SAA7134) += saa7134/ tuner.o tda9887.o video-buf.o
+obj-$(CONFIG_VIDEO_SAA7134) += saa7134/
 obj-$(CONFIG_TUNER_3036) += tuner-3036.o
+
+obj-$(CONFIG_VIDEO_TUNER) += tuner.o tda9887.o
+obj-$(CONFIG_VIDEO_BUF)   += video-buf.o

Signature · 1 line

Michael Moore for president!