From 42dba873f0da63e8ef40b233438eaf623515e294 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Mon, 25 Jul 2011 12:10:23 +0200 Subject: omap3isp: Move scaler field from omap3_isp_video to omap3_isp_pipeline Signed-off-by: Laurent Pinchart --- isp/omap3isp-priv.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'isp/omap3isp-priv.h') diff --git a/isp/omap3isp-priv.h b/isp/omap3isp-priv.h index 7864c63..b4d2114 100644 --- a/isp/omap3isp-priv.h +++ b/isp/omap3isp-priv.h @@ -65,7 +65,6 @@ struct omap3_isp_entity { * @video: V4L2 capture device * @format: Current video format * @pool: Buffers pool - * @scaler: Whether scaling should be performed on the ISP or the sensor * @dequeued: Bitmask of dequeued buffers that belong to the application * @queued: Number of buffers queued to the driver * @running: Whether video capture is running on the device @@ -75,7 +74,6 @@ struct omap3_isp_video { struct v4l2_device *video; struct v4l2_mbus_framefmt format; struct v4l2_buffers_pool *pool; - enum omap3_isp_scaler scaler; unsigned int dequeued; unsigned int queued; bool running; @@ -86,10 +84,12 @@ struct omap3_isp_video { /* * struct omap3_isp_pipeline - OMAP3 pipeline * @entitites: Entities in the pipeline + * @scaler: Whether scaling should be performed on the ISP or the sensor * @output: Video device at the output of the pipeline */ struct omap3_isp_pipeline { struct list_entry entities; + enum omap3_isp_scaler scaler; struct omap3_isp_video *output; }; -- cgit v1.2.3