diff options
Diffstat (limited to 'v4l/scripts/unmerge-trees.sh')
| -rw-r--r-- | v4l/scripts/unmerge-trees.sh | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/v4l/scripts/unmerge-trees.sh b/v4l/scripts/unmerge-trees.sh index e82662115..856331fba 100644 --- a/v4l/scripts/unmerge-trees.sh +++ b/v4l/scripts/unmerge-trees.sh @@ -15,10 +15,9 @@ rm or51132.h rm tda1004x.c rm tda1004x.h patch -p1 <<'DIFF' -diff -upr video4linux/Makefile -video4linux.orig/Makefile ---- video4linux/Makefile 2005-07-21 23:41:13.000000000 +0000 -+++ video4linux.orig/Makefile 2005-07-21 23:39:50.000000000 +0000 +diff -upr video4linux/Makefile video4linux.orig/Makefile +--- video4linux/Makefile 2005-07-29 21:44:41.000000000 +0000 ++++ video4linux.orig/Makefile 2005-07-29 21:45:09.000000000 +0000 @@ -39,8 +39,8 @@ obj-$(CONFIG_VIDEO_IR) += ir-common.o obj-$(CONFIG_VIDEO_TUNER) += tuner.o tda9887.o obj-$(CONFIG_VIDEO_TVAUDIO) += msp3400.o tvaudio.o tvmixer.o @@ -30,7 +29,15 @@ video4linux.orig/Makefile # 2.6-only stuff ifeq ($(VERSION).$(PATCHLEVEL),2.6) -@@ -139,7 +139,6 @@ ifeq ($(inst-m),) +@@ -54,7 +54,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) +@@ -130,7 +129,6 @@ ifeq ($(inst-m),) endif inst_common := ir-common.ko @@ -38,7 +45,7 @@ video4linux.orig/Makefile inst_video := btcx-risc.ko bttv.ko tda9887.ko tuner.ko tvaudio.ko tveeprom.ko inst_video += tvmixer.ko v4l1-compat.ko v4l2-common.ko inst_video += video-buf.ko video-buf-dvb.ko -@@ -166,9 +165,6 @@ install:: rminstall +@@ -157,9 +155,6 @@ install:: rminstall -install -d $(KDIR26)/common -install -m 644 -c $(inst_common) $(KDIR26)/common @@ -49,8 +56,8 @@ video4linux.orig/Makefile -install -m 644 -c $(inst_video) $(KDIR26)/video diff -upr video4linux/cx88-dvb.c video4linux.orig/cx88-dvb.c ---- video4linux/cx88-dvb.c 2005-07-23 05:36:30.000000000 +0000 -+++ video4linux.orig/cx88-dvb.c 2005-07-23 05:35:09.000000000 +0000 +--- video4linux/cx88-dvb.c 2005-07-29 21:44:41.000000000 +0000 ++++ video4linux.orig/cx88-dvb.c 2005-07-29 21:44:31.000000000 +0000 @@ -32,6 +32,10 @@ #include <linux/config.h> #include "compat.h" @@ -63,8 +70,8 @@ diff -upr video4linux/cx88-dvb.c video4linux.orig/cx88-dvb.c #include "dvb-pll.h" diff -upr video4linux/saa7134-dvb.c video4linux.orig/saa7134-dvb.c ---- video4linux/saa7134-dvb.c 2005-07-23 05:36:50.000000000 +0000 -+++ video4linux.orig/saa7134-dvb.c 2005-07-23 05:35:09.000000000 +0000 +--- video4linux/saa7134-dvb.c 2005-07-29 21:44:41.000000000 +0000 ++++ video4linux.orig/saa7134-dvb.c 2005-07-29 21:44:31.000000000 +0000 @@ -32,6 +32,10 @@ #include <linux/config.h> #include "compat.h" @@ -76,8 +83,3 @@ diff -upr video4linux/saa7134-dvb.c video4linux.orig/saa7134-dvb.c #include "saa7134-reg.h" #include "saa7134.h" -diff -uprN video4linux/.dvb /dev/null ---- video4linux/.dvb 2005-07-29 00:59:17.000000000 +0000 -+++ /dev/null 1970-01-01 00:00:00.000000000 +0000 -@@ -1 +0,0 @@ --1 |