diff options
| -rw-r--r-- | v4l/ChangeLog | 9 | ||||
| -rw-r--r-- | v4l/Make.config | 20 | ||||
| -rw-r--r-- | v4l/Makefile | 53 |
3 files changed, 76 insertions, 6 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 6ee69340f..1836b70f9 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,12 @@ +2005-11-24 21:38 mkrufky + + * ../v4l/Make.config: + * ../v4l/Makefile: + - added dvb device modules to build configuration. + - these will be enabled later in the merge-trees build. + + Signed-off-by: Michael Krufky <mkrufky@m1k.net> + 2005-11-23 09:39 nshmyrev * ../v4l/linux/drivers/media/video/saa711x.c: diff --git a/v4l/Make.config b/v4l/Make.config index 33412bedb..8a451440f 100644 --- a/v4l/Make.config +++ b/v4l/Make.config @@ -32,6 +32,26 @@ CONFIG_DVB_CORE := n CONFIG_DVB_B2C2_FLEXCOP := n CONFIG_DVB_B2C2_FLEXCOP_PCI := n CONFIG_DVB_B2C2_FLEXCOP_USB := n +CONFIG_DVB_CINERGYT2 := n +CONFIG_DVB_USB := n +CONFIG_DVB_USB_VP7045 := n +CONFIG_DVB_USB_VP702X := n +CONFIG_DVB_USB_DTT200U := n +CONFIG_DVB_USB_A800 := n +CONFIG_DVB_USB_DIBUSB_MB := n +CONFIG_DVB_USB_DIBUSB_MC := n +CONFIG_DVB_USB_NOVA_T_USB2 := n +CONFIG_DVB_USB_UMT_010 := n +CONFIG_DVB_USB_DIGITV := n +CONFIG_DVB_USB_CXUSB := n +CONFIG_DVB_PLUTO2 := n +CONFIG_DVB_BUDGET := n +CONFIG_DVB_BUDGET_AV := n +CONFIG_DVB_BUDGET_CI := n +CONFIG_DVB_BUDGET_PATCH := n +CONFIG_DVB_AV7110 := n +CONFIG_DVB_TTUSB_BUDGET := n +CONFIG_DVB_TTUSB_DEC := 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 41ba0d479..d599d0a6d 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -35,11 +35,26 @@ 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 \ +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 +b2c2-flexcop-pci-objs := flexcop-pci.o +b2c2-flexcop-usb-objs := flexcop-usb.o +dvb-usb-objs := dvb-usb-firmware.o dvb-usb-init.o dvb-usb-urb.o \ + dvb-usb-i2c.o dvb-usb-dvb.o dvb-usb-remote.o +dvb-usb-vp7045-objs := vp7045.o vp7045-fe.o +dvb-usb-vp702x-objs := vp702x.o vp702x-fe.o +dvb-usb-dtt200u-objs := dtt200u.o dtt200u-fe.o +dvb-usb-dibusb-common-objs := dibusb-common.o +dvb-usb-a800-objs := a800.o +dvb-usb-dibusb-mb-objs := dibusb-mb.o +dvb-usb-dibusb-mc-objs := dibusb-mc.o +dvb-usb-nova-t-usb2-objs := nova-t-usb2.o +dvb-usb-umt-010-objs := umt-010.o +dvb-usb-digitv-objs := digitv.o +dvb-usb-cxusb-objs := cxusb.o +dvb-ttpci-objs := av7110_hw.o av7110_v4l.o av7110_av.o \ + av7110_ca.o av7110.o av7110_ipack.o av7110_ir.o obj-m := video-buf.o v4l1-compat.o v4l2-common.o obj-m += compat_ioctl32.o @@ -72,12 +87,36 @@ 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 \ - mt312.o stv0299.o nxt2002.o bcm3510.o + mt312.o stv0299.o nxt2002.o bcm3510.o \ + dib3000mb.o dib3000mc.o ves1820.o \ + cx22700.o tda8083.o ves1x93.o stv0297.o \ + sp8870.o l64781.o s5h1420.o tda10021.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 +obj-$(CONFIG_DVB_CINERGYT2) += cinergyT2.o +obj-$(CONFIG_DVB_PLUTO2) += pluto2.o +obj-$(CONFIG_DVB_TTUSB_BUDGET) += dvb-ttusb-budget.o +obj-$(CONFIG_DVB_TTUSB_DEC) += ttusb_dec.o ttusbdecfe.o +obj-$(CONFIG_DVB_USB) += dvb-usb.o +obj-$(CONFIG_DVB_USB_VP7045) += dvb-usb-vp7045.o +obj-$(CONFIG_DVB_USB_VP702X) += dvb-usb-vp702x.o +obj-$(CONFIG_DVB_USB_DTT200U) += dvb-usb-dtt200u.o +obj-$(CONFIG_DVB_USB_A800) += dvb-usb-dibusb-common.o dvb-usb-a800.o +obj-$(CONFIG_DVB_USB_DIBUSB_MB) += dvb-usb-dibusb-common.o dvb-usb-dibusb-mb.o +obj-$(CONFIG_DVB_USB_DIBUSB_MC) += dvb-usb-dibusb-common.o dvb-usb-dibusb-mc.o +obj-$(CONFIG_DVB_USB_NOVA_T_USB2) += dvb-usb-dibusb-common.o \ + dvb-usb-nova-t-usb2.o +obj-$(CONFIG_DVB_USB_UMT_010) += dvb-usb-dibusb-common.o dvb-usb-umt-010.o +obj-$(CONFIG_DVB_USB_DIGITV) += dvb-usb-digitv.o +obj-$(CONFIG_DVB_USB_CXUSB) += dvb-usb-cxusb.o +obj-$(CONFIG_DVB_BUDGET) += budget-core.o budget.o ttpci-eeprom.o +obj-$(CONFIG_DVB_BUDGET_AV) += budget-core.o budget-av.o ttpci-eeprom.o +obj-$(CONFIG_DVB_BUDGET_CI) += budget-core.o budget-ci.o ttpci-eeprom.o +obj-$(CONFIG_DVB_BUDGET_PATCH) += budget-core.o budget-patch.o ttpci-eeprom.o +obj-$(CONFIG_DVB_AV7110) += dvb-ttpci.o ttpci-eeprom.o # 2.6-only stuff ifeq ($(VERSION).$(PATCHLEVEL),2.6) @@ -194,8 +233,10 @@ ifeq ($(CONFIG_DVB_BT8XX_DST),m) 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_frontends += nxt200x.ko cx24123.ko mt312.ko stv0299.ko nxt2002.ko +inst_frontends += bcm3510.ko dib3000mb.ko dib3000mc.ko ves1820.ko +inst_frontends += cx22700.ko tda8083.ko ves1x93.ko stv0297.ko sp8870.ko +inst_frontends += l64781.ko s5h1420.ko tda10021.o inst_dvb-core := dvb-core.ko |