diff options
Diffstat (limited to 'v4l/scripts/unmerge-trees.sh')
| -rw-r--r-- | v4l/scripts/unmerge-trees.sh | 50 |
1 files changed, 44 insertions, 6 deletions
diff --git a/v4l/scripts/unmerge-trees.sh b/v4l/scripts/unmerge-trees.sh index 8b2d5b2a9..4b76857c1 100644 --- a/v4l/scripts/unmerge-trees.sh +++ b/v4l/scripts/unmerge-trees.sh @@ -15,22 +15,60 @@ rm or51132.c rm or51132.h rm tda1004x.c rm tda1004x.h +rm sp887x.c +rm sp887x.h +rm nxt6000.c +rm nxt6000.h +rm nxt6000_priv.h +rm cx24110.c +rm cx24110.h +rm or51211.c +rm or51211.h +rm bt878.c +rm bt878.h +rm dvb-bt8xx.c +rm dvb-bt8xx.h +rm dst.c +rm dst_ca.c +rm dst_ca.h +rm dst_common.h +rm dst_priv.h patch -p1 <<'DIFF' +diff -upr video4linux/Make.config video4linux.orig/Make.config +--- video4linux/Make.config 2005-08-28 12:31:17.000000000 +0000 ++++ video4linux.orig/Make.config 2005-08-28 12:00:10.000000000 +0000 +@@ -14,7 +14,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) +@@ -23,6 +22,5 @@ endif + ifeq ($(need_dvb),yes) + CONFIG_VIDEO_CX88_DVB := m + CONFIG_VIDEO_SAA7134_DVB := m +- CONFIG_DVB_BT8XX := m + endif + diff -upr video4linux/Makefile video4linux.orig/Makefile ---- video4linux/Makefile 2005-08-17 00:50:13.000000000 +0000 -+++ video4linux.orig/Makefile 2005-08-17 00:48:25.000000000 +0000 -@@ -45,8 +45,8 @@ obj-$(CONFIG_VIDEO_IR) += ir-common.o +--- video4linux/Makefile 2005-08-28 12:29:03.000000000 +0000 ++++ video4linux.orig/Makefile 2005-08-28 12:00:10.000000000 +0000 +@@ -45,10 +45,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) -@@ -60,7 +60,6 @@ ifeq ($(VERSION).$(PATCHLEVEL),2.6) +@@ -62,7 +60,6 @@ ifeq ($(VERSION).$(PATCHLEVEL),2.6) endif # for DVB @@ -38,7 +76,7 @@ diff -upr video4linux/Makefile video4linux.orig/Makefile EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core/ EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/frontends/ ifeq ($(CONFIG_VIDEO_CX88_DVB),m) -@@ -139,7 +138,6 @@ inst_video += ir-kbd-gpio.ko ir-kbd-i2c. +@@ -141,7 +138,6 @@ inst_video += ir-kbd-gpio.ko ir-kbd-i2c. 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 @@ -46,7 +84,7 @@ diff -upr video4linux/Makefile video4linux.orig/Makefile v4l_modules := $(shell lsmod|cut -d' ' -f1 ) $(patsubst %.ko,%,$(inst-m)) -@@ -159,9 +157,6 @@ install:: rminstall +@@ -161,9 +157,6 @@ install:: rminstall -install -d $(KDIR26)/common -install -m 644 -c $(inst_common) $(KDIR26)/common |