diff options
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/Make.config | 14 | ||||
| -rw-r--r-- | v4l/Makefile | 16 | ||||
| -rw-r--r-- | v4l/scripts/update | 8 |
3 files changed, 22 insertions, 16 deletions
diff --git a/v4l/Make.config b/v4l/Make.config index fddfc4cf1..c3c14b78f 100644 --- a/v4l/Make.config +++ b/v4l/Make.config @@ -6,10 +6,14 @@ CONFIG_VIDEO_SAA7134 := m CONFIG_VIDEO_IR := m CONFIG_VIDEO_TUNER := m CONFIG_VIDEO_TVAUDIO := m +CONFIG_VIDEO_CX88 := m -ifeq ($(VERSION).$(PATCHLEVEL),2.6) - CONFIG_VIDEO_CX88 := m - ifeq ($(SUBLEVEL),9) - CONFIG_VIDEO_CX88_DVB := m - endif +# doesn't build without patches from dvb cvs +# use "make DVB=1" to build with DVB support. +ifeq ($(DVB),1) + CONFIG_VIDEO_CX88_DVB := m + CONFIG_VIDEO_SAA7134_DVB := m +else + CONFIG_VIDEO_CX88_DVB := n + CONFIG_VIDEO_SAA7134_DVB := n endif diff --git a/v4l/Makefile b/v4l/Makefile index ef88aa659..1c9ed9ded 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -20,7 +20,7 @@ bttv-objs := bttv-driver.o bttv-cards.o bttv-risc.o bttv-if.o \ bttv-vbi.o bttv-i2c.o saa7134-objs := saa7134-core.o saa7134-i2c.o saa7134-video.o \ saa7134-vbi.o saa7134-tvaudio.o saa7134-oss.o \ - saa7134-cards.o saa7134-ts.o + saa7134-cards.o saa7134-ts.o saa7134-input.o cx88xx-objs := cx88-cards.o cx88-core.o cx88-i2c.o cx88-tvaudio.o cx8800-objs := cx88-video.o cx88-vbi.o cx8801-objs := cx88-alsa.o @@ -32,25 +32,21 @@ obj-m := video-buf.o v4l1-compat.o v4l2-common.o obj-$(CONFIG_VIDEO_BTTV) += btcx-risc.o ir-common.o bttv.o obj-$(CONFIG_VIDEO_CX88) += btcx-risc.o cx88xx.o cx8800.o cx8801.o cx8802.o \ cx88-blackbird.o -obj-$(CONFIG_VIDEO_CX88_DVB) += cx88-dvb.o cx22702.o -obj-$(CONFIG_VIDEO_SAA7134) += saa7134.o saa6752hs.o +obj-$(CONFIG_VIDEO_SAA7134) += saa7134.o saa7134-empress.o saa6752hs.o obj-$(CONFIG_VIDEO_IR) += ir-common.o obj-$(CONFIG_VIDEO_TUNER) += tuner.o tda9887.o obj-$(CONFIG_VIDEO_TVAUDIO) += msp3400.o tvaudio.o tvmixer.o +obj-$(CONFIG_VIDEO_CX88_DVB) += video-buf-dvb.o cx88-dvb.o cx22702.o +obj-$(CONFIG_VIDEO_SAA7134_DVB) += video-buf-dvb.o saa7134-dvb.o + # 2.6-only stuff ifeq ($(VERSION).$(PATCHLEVEL),2.6) ifeq ($(CONFIG_VIDEO_BTTV),m) bttv-objs += bttv-gpio.o obj-$(CONFIG_VIDEO_IR) += ir-kbd-gpio.o ir-kbd-i2c.o endif -endif - -# ir for saa7134 -ifeq ($(CONFIG_VIDEO_IR),m) - EXTRA_CFLAGS += -DCONFIG_VIDEO_IR=1 - saa7134-objs += saa7134-input.o - ifeq ($(VERSION).$(PATCHLEVEL),2.6) + ifeq ($(CONFIG_VIDEO_SAA7134),m) obj-$(CONFIG_VIDEO_IR) += ir-kbd-i2c.o endif endif diff --git a/v4l/scripts/update b/v4l/scripts/update index c4529e238..b5ad0b75b 100644 --- a/v4l/scripts/update +++ b/v4l/scripts/update @@ -32,6 +32,8 @@ xrmmod cx88xx xrmmod cx22702 # saa7134 +xrmmod saa7134-dvb +xrmmod saa7134-empress xrmmod saa7134 # saa7146 @@ -41,6 +43,7 @@ xrmmod saa7146_vv # common xrmmod btcx-risc xrmmod ir-common +xrmmod video-buf-dvb xrmmod video-buf # i2c @@ -57,10 +60,11 @@ sync; sleep 1; # common v4l2basic #xrmmod video-buf -#xinsmod video-buf debug=2 +xinsmod video-buf debug=0 #xrmmod v4l1-compat #xinsmod v4l1-compat debug=1 +xinsmod video-buf-dvb xinsmod btcx-risc debug=0 xinsmod ir-common debug=0 repeat=0 xinsmod tuner debug=0 @@ -84,3 +88,5 @@ xinsmod cx88-dvb # saa7134 xinsmod saa7134 audio_debug=0 i2c_scan=1 $saopt +xinsmod saa7134-empress +xinsmod saa7134-dvb |