From 5da545ad08a3c6ea71d3ba074adc7582e7e9a024 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Tue, 1 May 2012 11:06:44 -0300 Subject: [media] saa7146: move overlay information from saa7146_fh into saa7146_vv This is global information, not per-filehandle information. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- include/media/saa7146_vv.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'include/media/saa7146_vv.h') diff --git a/include/media/saa7146_vv.h b/include/media/saa7146_vv.h index b4761edafa69..feb444b554aa 100644 --- a/include/media/saa7146_vv.h +++ b/include/media/saa7146_vv.h @@ -88,9 +88,6 @@ struct saa7146_fh { /* if this is a vbi or capture open */ enum v4l2_buf_type type; - /* video overlay */ - struct saa7146_overlay ov; - /* video capture */ struct videobuf_queue video_q; struct v4l2_pix_format video_fmt; @@ -119,9 +116,9 @@ struct saa7146_vv struct saa7146_fh *video_fh; /* video overlay */ + struct saa7146_overlay ov; struct v4l2_framebuffer ov_fb; struct saa7146_format *ov_fmt; - struct saa7146_overlay *ov_data; struct saa7146_fh *ov_suspend; /* video capture */ -- cgit v1.2.3