aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2012-05-01 10:28:20 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-05-14 13:58:39 -0400
commitfca3469aa844e2ae993445aa5f41397003199be7 (patch)
tree84484f23df213f2c2ff147536639f6f43106e06c /include
parentfd74d6eb4c2c1caa18208df32d9d38b5fe9738fc (diff)
[media] saa7146: move vbi fields from saa7146_fh to saa7146_vv
This fields are global and don't belong in a fh struct. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include')
-rw-r--r--include/media/saa7146_vv.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/media/saa7146_vv.h b/include/media/saa7146_vv.h
index 7f61645a1c7b..658ae8361d5e 100644
--- a/include/media/saa7146_vv.h
+++ b/include/media/saa7146_vv.h
@@ -93,8 +93,6 @@ struct saa7146_fh {
93 93
94 /* vbi capture */ 94 /* vbi capture */
95 struct videobuf_queue vbi_q; 95 struct videobuf_queue vbi_q;
96 struct v4l2_vbi_format vbi_fmt;
97 struct timer_list vbi_read_timeout;
98 96
99 unsigned int resources; /* resource management for device open */ 97 unsigned int resources; /* resource management for device open */
100}; 98};
@@ -106,6 +104,8 @@ struct saa7146_vv
106{ 104{
107 /* vbi capture */ 105 /* vbi capture */
108 struct saa7146_dmaqueue vbi_q; 106 struct saa7146_dmaqueue vbi_q;
107 struct v4l2_vbi_format vbi_fmt;
108 struct timer_list vbi_read_timeout;
109 /* vbi workaround interrupt queue */ 109 /* vbi workaround interrupt queue */
110 wait_queue_head_t vbi_wq; 110 wait_queue_head_t vbi_wq;
111 int vbi_fieldcount; 111 int vbi_fieldcount;