diff options
| author | Michael Krufky <devnull@localhost> | 2005-11-24 20:44:28 +0000 |
|---|---|---|
| committer | Michael Krufky <devnull@localhost> | 2005-11-24 20:44:28 +0000 |
| commit | 3d24ce81f2ff7882a81c5eddeba4885fb7361c86 (patch) | |
| tree | 2e6d93e0446b59eb955bb4c71738c7b92efa713a | |
| parent | 8640d956431ee7f1b1222aae89a18ffdf479a2e4 (diff) | |
| download | mediapointer-dvb-s2-3d24ce81f2ff7882a81c5eddeba4885fb7361c86.tar.gz mediapointer-dvb-s2-3d24ce81f2ff7882a81c5eddeba4885fb7361c86.tar.bz2 | |
add b2c2-flexcop to dvb/v4l merged-trees build
- added b2c2-flexcop build configuration to Makefile
- this will be enabled later on with the merge scripts
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
| -rw-r--r-- | v4l/Make.config | 3 | ||||
| -rw-r--r-- | v4l/Makefile | 17 |
2 files changed, 16 insertions, 4 deletions
diff --git a/v4l/Make.config b/v4l/Make.config index 551ad1506..33412bedb 100644 --- a/v4l/Make.config +++ b/v4l/Make.config @@ -29,6 +29,9 @@ CONFIG_DVB_BT8XX := n CONFIG_DVB_BT8XX_DST := n CONFIG_DVB_FRONTENDS := n CONFIG_DVB_CORE := n +CONFIG_DVB_B2C2_FLEXCOP := n +CONFIG_DVB_B2C2_FLEXCOP_PCI := n +CONFIG_DVB_B2C2_FLEXCOP_USB := n ifneq ($(KERNELRELEASE),) CONFIG_VIDEO_BUF_DVB := $(shell test $(SUBLEVEL) -ge 12 -a $(PATCHLEVEL) -ge 6 && echo m) diff --git a/v4l/Makefile b/v4l/Makefile index d793acc80..41ba0d479 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -35,6 +35,11 @@ cx25840-objs := cx25840-core.o cx25840-audio.o cx25840-firmware.o \ dvb-core-objs := dvbdev.o dmxdev.o dvb_demux.o dvb_filter.o \ dvb_ca_en50221.o dvb_frontend.o \ dvb_net.o dvb_ringbuffer.o +b2c2-flexcop-objs := flexcop.o flexcop-fe-tuner.o flexcop-i2c.o \ + flexcop-sram.o flexcop-eeprom.o flexcop-misc.o \ + flexcop-hw-filter.o flexcop-dma.o +b2c2-flexcop-pci-objs := flexcop-pci.o +b2c2-flexcop-usb-objs := flexcop-usb.o obj-m := video-buf.o v4l1-compat.o v4l2-common.o obj-m += compat_ioctl32.o @@ -66,8 +71,13 @@ obj-$(CONFIG_DVB_BT8XX) += bt878.o dvb-bt8xx.o obj-$(CONFIG_DVB_BT8XX_DST) += dst.o dst_ca.o obj-$(CONFIG_DVB_FRONTENDS) += cx22702.o dvb-pll.o or51132.o lgdt330x.o \ mt352.o tda1004x.o sp887x.o nxt6000.o \ - cx24110.o or51211.o nxt200x.o cx24123.o + cx24110.o or51211.o nxt200x.o cx24123.o \ + mt312.o stv0299.o nxt2002.o bcm3510.o obj-$(CONFIG_DVB_CORE) += dvb-core.o +obj-$(CONFIG_DVB_B2C2_FLEXCOP) += b2c2-flexcop.o +obj-$(CONFIG_DVB_B2C2_FLEXCOP) += stv0297_cs2.o +obj-$(CONFIG_DVB_B2C2_FLEXCOP_PCI) += b2c2-flexcop-pci.o +obj-$(CONFIG_DVB_B2C2_FLEXCOP_USB) += b2c2-flexcop-usb.o # 2.6-only stuff ifeq ($(VERSION).$(PATCHLEVEL),2.6) @@ -185,6 +195,7 @@ endif inst_frontends := cx22702.ko dvb-pll.ko lgdt330x.ko or51132.ko tda1004x.ko inst_frontends += mt352.ko sp887x.ko nxt6000.ko cx24110.ko or51211.ko inst_frontends += nxt200x.ko cx24123.ko +inst_frontends += mt312.ko stv0299.ko nxt2002.ko bcm3510.ko inst_dvb-core := dvb-core.ko @@ -206,9 +217,7 @@ links:: @ln -sf ../linux/drivers/media/common/ir-common.c . dvb-links:: - @find ../linux/drivers/media/dvb/frontends -name '*.[c,h]' -type l -exec ln -sf '{}' . \; - @find ../linux/drivers/media/dvb/bt8xx -name '*.[c,h]' -type l -exec ln -sf '{}' . \; - @find ../linux/drivers/media/dvb/dvb-core -name '*.[c,h]' -type l -exec ln -sf '{}' . \; + @find ../linux/drivers/media/dvb -name '*.[c,h]' -type l -exec ln -sf '{}' . \; @find ../linux/include/linux/dvb -name '*.h' -type l -exec ln -sf '{}' . \; install:: rminstall |