diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2012-05-01 11:28:20 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-05-14 14:58:39 -0300 |
commit | fca3469aa844e2ae993445aa5f41397003199be7 (patch) | |
tree | 84484f23df213f2c2ff147536639f6f43106e06c /include/media | |
parent | fd74d6eb4c2c1caa18208df32d9d38b5fe9738fc (diff) | |
download | op-kernel-dev-fca3469aa844e2ae993445aa5f41397003199be7.zip op-kernel-dev-fca3469aa844e2ae993445aa5f41397003199be7.tar.gz |
[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/media')
-rw-r--r-- | include/media/saa7146_vv.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/media/saa7146_vv.h b/include/media/saa7146_vv.h index 7f61645..658ae83 100644 --- a/include/media/saa7146_vv.h +++ b/include/media/saa7146_vv.h @@ -93,8 +93,6 @@ struct saa7146_fh { /* vbi capture */ struct videobuf_queue vbi_q; - struct v4l2_vbi_format vbi_fmt; - struct timer_list vbi_read_timeout; unsigned int resources; /* resource management for device open */ }; @@ -106,6 +104,8 @@ struct saa7146_vv { /* vbi capture */ struct saa7146_dmaqueue vbi_q; + struct v4l2_vbi_format vbi_fmt; + struct timer_list vbi_read_timeout; /* vbi workaround interrupt queue */ wait_queue_head_t vbi_wq; int vbi_fieldcount; |