aboutsummaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2012-05-01 11:45:27 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-05-14 14:59:23 -0300
commit9bb601935b8495cd4ef8aea389df77233d6be5dd (patch)
tree9659876fa6b3f2c60e6cdd8bec08541f4b56512a /include/media
parent[media] saa7146: remove the unneeded type field from saa7146_fh (diff)
downloadlinux-dev-9bb601935b8495cd4ef8aea389df77233d6be5dd.tar.xz
linux-dev-9bb601935b8495cd4ef8aea389df77233d6be5dd.zip
[media] saa7146: rename vbi/video_q to vbi/video_dmaq
There was also a vbi_q and video_q in saa7146_fh, so that was confusing. 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.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/media/saa7146_vv.h b/include/media/saa7146_vv.h
index e9f434c74072..2cc32c514173 100644
--- a/include/media/saa7146_vv.h
+++ b/include/media/saa7146_vv.h
@@ -101,7 +101,7 @@ struct saa7146_fh {
struct saa7146_vv
{
/* vbi capture */
- struct saa7146_dmaqueue vbi_q;
+ struct saa7146_dmaqueue vbi_dmaq;
struct v4l2_vbi_format vbi_fmt;
struct timer_list vbi_read_timeout;
/* vbi workaround interrupt queue */
@@ -119,7 +119,7 @@ struct saa7146_vv
struct saa7146_fh *ov_suspend;
/* video capture */
- struct saa7146_dmaqueue video_q;
+ struct saa7146_dmaqueue video_dmaq;
struct v4l2_pix_format video_fmt;
enum v4l2_field last_field;