diff options
| author | Michael Krufky <devnull@localhost> | 2005-11-25 00:44:45 +0000 |
|---|---|---|
| committer | Michael Krufky <devnull@localhost> | 2005-11-25 00:44:45 +0000 |
| commit | 3eefa221e1aa627117abe32dd51729d075eca8e8 (patch) | |
| tree | 3c337d2537d97f3098c0ad7b723934a40eb7884d /v4l | |
| parent | d2b373a316f06ed67aed02dd9073510ebe6b8d74 (diff) | |
| download | mediapointer-dvb-s2-3eefa221e1aa627117abe32dd51729d075eca8e8.tar.gz mediapointer-dvb-s2-3eefa221e1aa627117abe32dd51729d075eca8e8.tar.bz2 | |
add saa7146 to merged build and fix dib3000
- added saa7146 module to build configuration.
- fix build for dib3000 frontend module.
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/Make.config | 2 | ||||
| -rw-r--r-- | v4l/Makefile | 15 |
2 files changed, 13 insertions, 4 deletions
diff --git a/v4l/Make.config b/v4l/Make.config index 8a451440f..bc77fd7fa 100644 --- a/v4l/Make.config +++ b/v4l/Make.config @@ -52,6 +52,8 @@ CONFIG_DVB_BUDGET_PATCH := n CONFIG_DVB_AV7110 := n CONFIG_DVB_TTUSB_BUDGET := n CONFIG_DVB_TTUSB_DEC := n +CONFIG_VIDEO_SAA7146 := n +CONFIG_VIDEO_SAA7146_VV := 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 d599d0a6d..8d2bfe69a 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -55,6 +55,9 @@ 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 +saa7146-objs := saa7146_i2c.o saa7146_core.o +saa7146_vv-objs := saa7146_vv_ksyms.o saa7146_fops.o \ + saa7146_video.o saa7146_hlp.o saa7146_vbi.o obj-m := video-buf.o v4l1-compat.o v4l2-common.o obj-m += compat_ioctl32.o @@ -88,9 +91,10 @@ 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 \ - dib3000mb.o dib3000mc.o ves1820.o \ - cx22700.o tda8083.o ves1x93.o stv0297.o \ - sp8870.o l64781.o s5h1420.o tda10021.o + dib3000-common.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 @@ -117,6 +121,8 @@ 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 +obj-$(CONFIG_VIDEO_SAA7146) += saa7146.o +obj-$(CONFIG_VIDEO_SAA7146_VV) += saa7146_vv.o # 2.6-only stuff ifeq ($(VERSION).$(PATCHLEVEL),2.6) @@ -258,8 +264,9 @@ links:: @ln -sf ../linux/drivers/media/common/ir-common.c . dvb-links:: + @find ../linux/drivers/media/common -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 '{}' . \; + @find ../linux/include -name '*.h' -type l -exec ln -sf '{}' . \; install:: rminstall @echo -e "\nInstalling new V4L modules at corresponding Kernel dir..." |