From 6e65ca942b9664a987866ac0c62e7e450777056b Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Sun, 29 Apr 2012 16:47:47 -0300 Subject: [media] mxb/saa7146: first round of cleanups Convert to the control framework, fix the easy v4l2-compliance failures. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- include/media/saa7146.h | 2 ++ include/media/saa7146_vv.h | 1 + 2 files changed, 3 insertions(+) (limited to 'include/media') diff --git a/include/media/saa7146.h b/include/media/saa7146.h index 0f037e8edf9a..c791940c579b 100644 --- a/include/media/saa7146.h +++ b/include/media/saa7146.h @@ -13,6 +13,7 @@ #include #include #include +#include #include /* for vmalloc() */ #include /* for vmalloc_to_page() */ @@ -121,6 +122,7 @@ struct saa7146_dev struct list_head item; struct v4l2_device v4l2_dev; + struct v4l2_ctrl_handler ctrl_handler; /* different device locks */ spinlock_t slock; diff --git a/include/media/saa7146_vv.h b/include/media/saa7146_vv.h index 4aeff96ff7d8..b4761edafa69 100644 --- a/include/media/saa7146_vv.h +++ b/include/media/saa7146_vv.h @@ -206,6 +206,7 @@ extern struct saa7146_use_ops saa7146_video_uops; int saa7146_start_preview(struct saa7146_fh *fh); int saa7146_stop_preview(struct saa7146_fh *fh); long saa7146_video_do_ioctl(struct file *file, unsigned int cmd, void *arg); +int saa7146_s_ctrl(struct v4l2_ctrl *ctrl); /* from saa7146_vbi.c */ extern struct saa7146_use_ops saa7146_vbi_uops; -- cgit v1.2.2