From c000782c9e1ae27ae9eb8a2ca43438b36e8cc684 Mon Sep 17 00:00:00 2001
From: Michael Krufky <devnull@localhost>
Date: Wed, 31 Aug 2005 03:55:55 +0000
Subject: fixed fuzz and offset in saa7134-dvb merge

---
 v4l/scripts/unmerge-trees.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'v4l/scripts/unmerge-trees.sh')

diff --git a/v4l/scripts/unmerge-trees.sh b/v4l/scripts/unmerge-trees.sh
index 583a5a77a..1275774d7 100644
--- a/v4l/scripts/unmerge-trees.sh
+++ b/v4l/scripts/unmerge-trees.sh
@@ -130,8 +130,8 @@ diff -up video4linux/cx88-dvb.c video4linux.orig/cx88-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 @@
- #include <linux/config.h>
+@@ -31,6 +31,10 @@
+ #include <linux/suspend.h>
  #include "compat.h"
  
 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
-- 
cgit v1.2.3