diff options
| author | Michael Krufky <devnull@localhost> | 2005-09-30 04:21:04 +0000 |
|---|---|---|
| committer | Michael Krufky <devnull@localhost> | 2005-09-30 04:21:04 +0000 |
| commit | 843386d48bf8083b00f05ad5f2b573a4f2e5598f (patch) | |
| tree | 57bf00239c41ef1bb2314082650c1ab44fb90709 | |
| parent | 3f17137c9765d6f74ef12b82a97fa8c2d8cbb4e2 (diff) | |
| download | mediapointer-dvb-s2-843386d48bf8083b00f05ad5f2b573a4f2e5598f.tar.gz mediapointer-dvb-s2-843386d48bf8083b00f05ad5f2b573a4f2e5598f.tar.bz2 | |
forgot to run unmerge-trees.sh before last commit. fixed now.
| -rw-r--r-- | v4l/Make.config | 2 | ||||
| -rw-r--r-- | v4l/Makefile | 18 |
2 files changed, 2 insertions, 18 deletions
diff --git a/v4l/Make.config b/v4l/Make.config index efdd9e580..d60cb7b8a 100644 --- a/v4l/Make.config +++ b/v4l/Make.config @@ -15,7 +15,6 @@ CONFIG_VIDEO_ALSA := n CONFIG_VIDEO_CX88_DVB := n CONFIG_VIDEO_SAA7134_DVB := n -CONFIG_DVB_BT8XX := n ifneq ($(KERNELRELEASE),) need_dvb = $(shell test $(SUBLEVEL) -ge 12 && echo yes) @@ -24,6 +23,5 @@ endif ifeq ($(need_dvb),yes) CONFIG_VIDEO_CX88_DVB := m CONFIG_VIDEO_SAA7134_DVB := m - CONFIG_DVB_BT8XX := n endif diff --git a/v4l/Makefile b/v4l/Makefile index 6765d41d1..4d05c93b4 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -47,10 +47,8 @@ obj-$(CONFIG_VIDEO_IR) += ir-common.o obj-$(CONFIG_VIDEO_TUNER) += tuner.o tda9887.o saa6588.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 dvb-pll.o or51132.o lgdt330x.o mt352.o -obj-$(CONFIG_VIDEO_SAA7134_DVB) += video-buf-dvb.o saa7134-dvb.o mt352.o tda1004x.o -obj-$(CONFIG_DVB_BT8XX) += bt878.o dvb-bt8xx.o dst.o dst_ca.o -obj-$(CONFIG_DVB_BT8XX) += mt352.o sp887x.o nxt6000.o cx24110.o or51211.o +obj-$(CONFIG_VIDEO_CX88_DVB) += video-buf-dvb.o cx88-dvb.o +obj-$(CONFIG_VIDEO_SAA7134_DVB) += video-buf-dvb.o saa7134-dvb.o # 2.6-only stuff ifeq ($(VERSION).$(PATCHLEVEL),2.6) @@ -64,7 +62,6 @@ ifeq ($(VERSION).$(PATCHLEVEL),2.6) endif # for DVB -EXTRA_CFLAGS += -DDVB_CVS=1 EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core/ EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/frontends/ ifeq ($(CONFIG_VIDEO_CX88_DVB),m) @@ -143,9 +140,6 @@ inst_video += ir-kbd-gpio.ko ir-kbd-i2c.ko msp3400.ko inst_cx88 := cx8800.ko cx8802.ko cx88-alsa.ko inst_cx88 += cx88-blackbird.ko cx88xx.ko cx88-dvb.ko inst_saa7134 := saa6752hs.ko saa7134.ko saa7134-empress.ko saa7134-dvb.ko -inst_bt8xx := bt878.ko dvb-bt8xx.ko dst.ko dst_ca.ko -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 v4l_modules := $(shell lsmod|cut -d' ' -f1 ) $(patsubst %.ko,%,$(inst-m)) @@ -165,12 +159,6 @@ install:: rminstall -install -d $(KDIR26)/common -install -m 644 -c $(inst_common) $(KDIR26)/common - -install -d $(KDIR26)/dvb/frontends - -install -m 644 -c $(inst_frontends) $(KDIR26)/dvb/frontends - - -install -d $(KDIR26)/dvb/bt8xx - -install -m 644 -c $(inst_bt8xx) $(KDIR26)/dvb/bt8xx - -install -d $(KDIR26)/video -install -m 644 -c $(inst_video) $(KDIR26)/video @@ -198,13 +186,11 @@ rminstall:: -@rm -r $(DEST) \ $(addprefix $(KDIR26)/common/, $(inst_common)) \ $(addprefix $(KDIR26)/dvb/frontends/, $(inst_frontends)) \ - $(addprefix $(KDIR26)/dvb/bt8xx/, $(inst_bt8xx)) \ $(addprefix $(KDIR26)/video/, $(inst_video)) \ $(addprefix $(KDIR26)/video/cx88/, $(inst_cx88)) \ $(addprefix $(KDIR26)/video/saa7134/, $(inst_saa7134)) \ $(addprefix $(KDIR26)/common/, $(addsuffix .gz,$(inst_common))) \ $(addprefix $(KDIR26)/dvb/frontends/, $(addsuffix .gz,$(inst_frontends))) \ - $(addprefix $(KDIR26)/dvb/bt8xx/, $(addsuffix .gz,$(inst_bt8xx))) \ $(addprefix $(KDIR26)/video/, $(addsuffix .gz,$(inst_video))) \ $(addprefix $(KDIR26)/video/cx88/, $(addsuffix .gz,$(inst_cx88))) \ $(addprefix $(KDIR26)/video/saa7134/, $(addsuffix .gz,$(inst_saa7134))) 2>/dev/null |