aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/platform/omap24xxcam.h
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2013-06-12 05:03:27 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-06-21 10:05:16 -0400
commit7a86969bd65eb7f19ea1c281c686a75429be950a (patch)
tree052e0c6cf096a2633d9f39934f1ad7c2bccf112f /drivers/media/platform/omap24xxcam.h
parentb60f9aa1a9fcf69df963c1f06ee0594d836f6760 (diff)
[media] omap24xxcam: add v4l2_device and replace parent with v4l2_dev
This driver did not yet support struct v4l2_device, so add it. This make it possible to replace the deprecated parent field with the v4l2_dev field, allowing the eventual removal of the parent field. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Acked-by: Sakari Ailus <sakari.ailus@iki.fi> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/platform/omap24xxcam.h')
-rw-r--r--drivers/media/platform/omap24xxcam.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/platform/omap24xxcam.h b/drivers/media/platform/omap24xxcam.h
index c4395956a493..7f6f79155537 100644
--- a/drivers/media/platform/omap24xxcam.h
+++ b/drivers/media/platform/omap24xxcam.h
@@ -29,6 +29,7 @@
29 29
30#include <media/videobuf-dma-sg.h> 30#include <media/videobuf-dma-sg.h>
31#include <media/v4l2-int-device.h> 31#include <media/v4l2-int-device.h>
32#include <media/v4l2-device.h>
32 33
33/* 34/*
34 * 35 *
@@ -462,6 +463,8 @@ struct omap24xxcam_device {
462 */ 463 */
463 struct mutex mutex; 464 struct mutex mutex;
464 465
466 struct v4l2_device v4l2_dev;
467
465 /*** general driver state information ***/ 468 /*** general driver state information ***/
466 atomic_t users; 469 atomic_t users;
467 /* 470 /*