From f1580aa239dfdb58cfdc6cc399f7d7db29c4564a Mon Sep 17 00:00:00 2001
From: Michael Krufky <devnull@localhost>
Date: Tue, 30 Aug 2005 05:05:13 +0000
Subject: fixed fuzz and offset in cx88-dvb merge

---
 v4l/scripts/merge-trees.sh   | 10 +++++-----
 v4l/scripts/unmerge-trees.sh | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'v4l/scripts')

diff --git a/v4l/scripts/merge-trees.sh b/v4l/scripts/merge-trees.sh
index 83e50285d..acc74e123 100644
--- a/v4l/scripts/merge-trees.sh
+++ b/v4l/scripts/merge-trees.sh
@@ -34,7 +34,7 @@ ln -s ../dvb-kernel/linux/drivers/media/dvb/bt8xx/dst_ca.h              dst_ca.h
 ln -s ../dvb-kernel/linux/drivers/media/dvb/bt8xx/dst_common.h          dst_common.h
 ln -s ../dvb-kernel/linux/drivers/media/dvb/bt8xx/dst_priv.h            dst_priv.h
 patch -p1 <<'DIFF'
-diff -upr video4linux.orig/Make.config video4linux/Make.config
+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
@@ -113,11 +113,11 @@ diff -up video4linux.orig/Makefile video4linux/Makefile
  		$(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
-diff -upr video4linux.orig/cx88-dvb.c video4linux/cx88-dvb.c
+diff -up video4linux.orig/cx88-dvb.c video4linux/cx88-dvb.c
 --- video4linux.orig/cx88-dvb.c	2005-08-17 00:48:25.000000000 +0000
 +++ video4linux/cx88-dvb.c	2005-08-17 00:49:02.000000000 +0000
-@@ -32,10 +32,6 @@
- #include <linux/config.h>
+@@ -31,10 +31,6 @@
+ #include <linux/suspend.h>
  #include "compat.h"
  
 -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
@@ -127,7 +127,7 @@ diff -upr video4linux.orig/cx88-dvb.c video4linux/cx88-dvb.c
  #include "cx88.h"
  #include "dvb-pll.h"
  
-diff -upr video4linux.orig/saa7134-dvb.c video4linux/saa7134-dvb.c
+diff -up video4linux.orig/saa7134-dvb.c video4linux/saa7134-dvb.c
 --- video4linux.orig/saa7134-dvb.c	2005-08-17 00:48:25.000000000 +0000
 +++ video4linux/saa7134-dvb.c	2005-08-17 00:49:02.000000000 +0000
 @@ -32,10 +32,6 @@
diff --git a/v4l/scripts/unmerge-trees.sh b/v4l/scripts/unmerge-trees.sh
index e0e32274c..583a5a77a 100644
--- a/v4l/scripts/unmerge-trees.sh
+++ b/v4l/scripts/unmerge-trees.sh
@@ -34,7 +34,7 @@ rm dst_ca.h
 rm dst_common.h
 rm dst_priv.h
 patch -p1 <<'DIFF'
-diff -upr video4linux/Make.config video4linux.orig/Make.config
+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
@@ -113,11 +113,11 @@ diff -up video4linux/Makefile video4linux.orig/Makefile
  		$(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
-diff -upr video4linux/cx88-dvb.c video4linux.orig/cx88-dvb.c
+diff -up video4linux/cx88-dvb.c video4linux.orig/cx88-dvb.c
 --- video4linux/cx88-dvb.c	2005-08-17 00:49:02.000000000 +0000
 +++ video4linux.orig/cx88-dvb.c	2005-08-17 00:48:25.000000000 +0000
-@@ -32,6 +32,10 @@
- #include <linux/config.h>
+@@ -31,6 +31,10 @@
+ #include <linux/suspend.h>
  #include "compat.h"
  
 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
@@ -127,7 +127,7 @@ diff -upr video4linux/cx88-dvb.c video4linux.orig/cx88-dvb.c
  #include "cx88.h"
  #include "dvb-pll.h"
  
-diff -upr video4linux/saa7134-dvb.c video4linux.orig/saa7134-dvb.c
+diff -up video4linux/saa7134-dvb.c video4linux.orig/saa7134-dvb.c
 --- video4linux/saa7134-dvb.c	2005-08-17 00:49:02.000000000 +0000
 +++ video4linux.orig/saa7134-dvb.c	2005-08-17 00:48:25.000000000 +0000
 @@ -32,6 +32,10 @@
-- 
cgit v1.2.3