From fbe4c8d77f5bdffa7f6f90e6dd3abdd2faeef203 Mon Sep 17 00:00:00 2001
From: "Nickolay V. Shmyrev" <devnull@localhost>
Date: Tue, 24 May 2005 23:13:06 +0000
Subject: Merge v4l-saa7134-ntsc-vbi-fix.patch

---
 linux/drivers/media/video/saa7134/saa7134.h | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'linux/drivers/media/video/saa7134/saa7134.h')

diff --git a/linux/drivers/media/video/saa7134/saa7134.h b/linux/drivers/media/video/saa7134/saa7134.h
index 47984ef96..b92a2594f 100644
--- a/linux/drivers/media/video/saa7134/saa7134.h
+++ b/linux/drivers/media/video/saa7134/saa7134.h
@@ -1,5 +1,5 @@
 /*
- * $Id: saa7134.h,v 1.39 2005/05/22 19:23:39 nsh Exp $
+ * $Id: saa7134.h,v 1.40 2005/05/24 23:13:06 nsh Exp $
  *
  * v4l2 device driver for philips saa7134 based TV cards
  *
@@ -21,7 +21,7 @@
  */
 
 #include <linux/version.h>
-#define SAA7134_VERSION_CODE KERNEL_VERSION(0,2,12)
+#define SAA7134_VERSION_CODE KERNEL_VERSION(0,2,13)
 
 #include <linux/pci.h>
 #include <linux/i2c.h>
@@ -110,9 +110,10 @@ struct saa7134_tvnorm {
 	unsigned int  h_stop;
 	unsigned int  video_v_start;
 	unsigned int  video_v_stop;
-	unsigned int  vbi_v_start;
-	unsigned int  vbi_v_stop;
+	unsigned int  vbi_v_start_0;
+	unsigned int  vbi_v_stop_0;
 	unsigned int  src_timing;
+	unsigned int  vbi_v_start_1;
 };
 
 struct saa7134_tvaudio {
-- 
cgit v1.2.3