summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/saa7134/saa7134.h
diff options
context:
space:
mode:
authorNickolay V. Shmyrev <devnull@localhost>2005-05-24 23:13:06 +0000
committerNickolay V. Shmyrev <devnull@localhost>2005-05-24 23:13:06 +0000
commitfbe4c8d77f5bdffa7f6f90e6dd3abdd2faeef203 (patch)
tree08eb5fcb36b2c56fd196984c369bd9ca3b1c45f6 /linux/drivers/media/video/saa7134/saa7134.h
parentb6a92361ea58317a2dcc89cb37e36faa0a23a289 (diff)
downloadmediapointer-dvb-s2-fbe4c8d77f5bdffa7f6f90e6dd3abdd2faeef203.tar.gz
mediapointer-dvb-s2-fbe4c8d77f5bdffa7f6f90e6dd3abdd2faeef203.tar.bz2
Merge v4l-saa7134-ntsc-vbi-fix.patch
Diffstat (limited to 'linux/drivers/media/video/saa7134/saa7134.h')
-rw-r--r--linux/drivers/media/video/saa7134/saa7134.h9
1 files changed, 5 insertions, 4 deletions
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 {