offsets

2 files changed, 14 insertions, 14 deletions

diff --git a/v4l/scripts/merge-trees.sh b/v4l/scripts/merge-trees.sh
index a9ffa2b35..aa7a7fb7f 100644
--- a/v4l/scripts/merge-trees.sh
+++ b/v4l/scripts/merge-trees.sh
@@ -42,7 +42,7 @@ patch -p1 <<'DIFF'
 diff -up video4linux.orig/Make.config video4linux/Make.config
 --- video4linux.orig/Make.config	2005-08-28 12:00:10.000000000 +0000
 +++ video4linux/Make.config	2005-08-28 12:31:17.000000000 +0000
-@@ -14,6 +14,7 @@ CONFIG_VIDEO_ALSA	:= n
+@@ -15,6 +15,7 @@ CONFIG_VIDEO_ALSA	:= n
  
  CONFIG_VIDEO_CX88_DVB	:= n
  CONFIG_VIDEO_SAA7134_DVB := n
@@ -50,7 +50,7 @@ diff -up video4linux.orig/Make.config video4linux/Make.config
  
  ifneq ($(KERNELRELEASE),)
  need_dvb = $(shell test $(SUBLEVEL) -ge 12 && echo yes)
-@@ -22,5 +23,6 @@ endif
+@@ -23,5 +24,6 @@ endif
  ifeq ($(need_dvb),yes)
   CONFIG_VIDEO_CX88_DVB	:= m
   CONFIG_VIDEO_SAA7134_DVB := m
@@ -60,7 +60,7 @@ diff -up video4linux.orig/Make.config video4linux/Make.config
 diff -up video4linux.orig/Makefile video4linux/Makefile
 --- video4linux.orig/Makefile	2005-08-28 15:42:01.000000000 +0000
 +++ video4linux/Makefile	2005-08-28 15:52:54.000000000 +0000
-@@ -45,8 +45,10 @@ obj-$(CONFIG_VIDEO_IR)		+= ir-common.o
+@@ -47,8 +47,10 @@ 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
  
@@ -73,7 +73,7 @@ diff -up video4linux.orig/Makefile video4linux/Makefile
  
  # 2.6-only stuff
  ifeq ($(VERSION).$(PATCHLEVEL),2.6)
-@@ -60,6 +62,7 @@ ifeq ($(VERSION).$(PATCHLEVEL),2.6)
+@@ -62,6 +64,7 @@ ifeq ($(VERSION).$(PATCHLEVEL),2.6)
  endif
  
  # for DVB
@@ -81,7 +81,7 @@ diff -up video4linux.orig/Makefile video4linux/Makefile
  EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core/
  EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/frontends/
  ifeq ($(CONFIG_VIDEO_CX88_DVB),m)
-@@ -138,6 +141,9 @@ inst_video += ir-kbd-gpio.ko ir-kbd-i2c.
+@@ -140,6 +143,9 @@ 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
@@ -91,7 +91,7 @@ diff -up video4linux.orig/Makefile video4linux/Makefile
  
  v4l_modules := $(shell lsmod|cut -d' ' -f1 ) $(patsubst %.ko,%,$(inst-m))
  
-@@ -157,6 +163,12 @@ install:: rminstall
+@@ -159,6 +165,12 @@ install:: rminstall
  	-install -d $(KDIR26)/common
  	-install -m 644 -c $(inst_common) $(KDIR26)/common
  
@@ -104,7 +104,7 @@ diff -up video4linux.orig/Makefile video4linux/Makefile
  	-install -d $(KDIR26)/video
  	-install -m 644 -c $(inst_video) $(KDIR26)/video
  
-@@ -184,11 +196,13 @@ rminstall::
+@@ -186,11 +198,13 @@ rminstall::
  	-@rm -r $(DEST) \
  		$(addprefix $(KDIR26)/common/, $(inst_common)) \
  		$(addprefix $(KDIR26)/dvb/frontends/, $(inst_frontends)) \
diff --git a/v4l/scripts/unmerge-trees.sh b/v4l/scripts/unmerge-trees.sh
index bd5b0ee2c..2d8ef70bf 100644
--- a/v4l/scripts/unmerge-trees.sh
+++ b/v4l/scripts/unmerge-trees.sh
@@ -42,7 +42,7 @@ patch -p1 <<'DIFF'
 diff -up 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
+@@ -15,7 +15,6 @@ CONFIG_VIDEO_ALSA	:= n
  
  CONFIG_VIDEO_CX88_DVB	:= n
  CONFIG_VIDEO_SAA7134_DVB := n
@@ -50,7 +50,7 @@ diff -up video4linux/Make.config video4linux.orig/Make.config
  
  ifneq ($(KERNELRELEASE),)
  need_dvb = $(shell test $(SUBLEVEL) -ge 12 && echo yes)
-@@ -23,6 +22,5 @@ endif
+@@ -24,6 +23,5 @@ endif
  ifeq ($(need_dvb),yes)
   CONFIG_VIDEO_CX88_DVB	:= m
   CONFIG_VIDEO_SAA7134_DVB := m
@@ -60,7 +60,7 @@ diff -up video4linux/Make.config video4linux.orig/Make.config
 diff -up video4linux/Makefile video4linux.orig/Makefile
 --- video4linux/Makefile	2005-08-28 15:52:54.000000000 +0000
 +++ video4linux.orig/Makefile	2005-08-28 15:42:01.000000000 +0000
-@@ -45,10 +45,8 @@ obj-$(CONFIG_VIDEO_IR)		+= ir-common.o
+@@ -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
  
@@ -73,7 +73,7 @@ diff -up video4linux/Makefile video4linux.orig/Makefile
  
  # 2.6-only stuff
  ifeq ($(VERSION).$(PATCHLEVEL),2.6)
-@@ -62,7 +60,6 @@ ifeq ($(VERSION).$(PATCHLEVEL),2.6)
+@@ -64,7 +62,6 @@ ifeq ($(VERSION).$(PATCHLEVEL),2.6)
  endif
  
  # for DVB
@@ -81,7 +81,7 @@ diff -up 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)
-@@ -141,9 +138,6 @@ inst_video += ir-kbd-gpio.ko ir-kbd-i2c.
+@@ -143,9 +140,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
@@ -91,7 +91,7 @@ diff -up video4linux/Makefile video4linux.orig/Makefile
  
  v4l_modules := $(shell lsmod|cut -d' ' -f1 ) $(patsubst %.ko,%,$(inst-m))
  
-@@ -163,12 +157,6 @@ install:: rminstall
+@@ -165,12 +159,6 @@ install:: rminstall
  	-install -d $(KDIR26)/common
  	-install -m 644 -c $(inst_common) $(KDIR26)/common
  
@@ -104,7 +104,7 @@ diff -up video4linux/Makefile video4linux.orig/Makefile
  	-install -d $(KDIR26)/video
  	-install -m 644 -c $(inst_video) $(KDIR26)/video
  
-@@ -196,13 +184,11 @@ rminstall::
+@@ -198,13 +186,11 @@ rminstall::
  	-@rm -r $(DEST) \
  		$(addprefix $(KDIR26)/common/, $(inst_common)) \
  		$(addprefix $(KDIR26)/dvb/frontends/, $(inst_frontends)) \