diff options
Diffstat (limited to 'drivers/media/platform/omap3isp/ispvideo.c')
-rw-r--r-- | drivers/media/platform/omap3isp/ispvideo.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/media/platform/omap3isp/ispvideo.c b/drivers/media/platform/omap3isp/ispvideo.c index a0b737fecf1..6e74346cc35 100644 --- a/drivers/media/platform/omap3isp/ispvideo.c +++ b/drivers/media/platform/omap3isp/ispvideo.c | |||
@@ -27,6 +27,7 @@ | |||
27 | #include <linux/clk.h> | 27 | #include <linux/clk.h> |
28 | #include <linux/mm.h> | 28 | #include <linux/mm.h> |
29 | #include <linux/module.h> | 29 | #include <linux/module.h> |
30 | #include <linux/omap-iommu.h> | ||
30 | #include <linux/pagemap.h> | 31 | #include <linux/pagemap.h> |
31 | #include <linux/scatterlist.h> | 32 | #include <linux/scatterlist.h> |
32 | #include <linux/sched.h> | 33 | #include <linux/sched.h> |
@@ -34,8 +35,6 @@ | |||
34 | #include <linux/vmalloc.h> | 35 | #include <linux/vmalloc.h> |
35 | #include <media/v4l2-dev.h> | 36 | #include <media/v4l2-dev.h> |
36 | #include <media/v4l2-ioctl.h> | 37 | #include <media/v4l2-ioctl.h> |
37 | #include <plat/iommu.h> | ||
38 | #include <plat/iovmm.h> | ||
39 | #include <plat/omap-pm.h> | 38 | #include <plat/omap-pm.h> |
40 | 39 | ||
41 | #include "ispvideo.h" | 40 | #include "ispvideo.h" |
@@ -792,7 +791,7 @@ isp_video_get_crop(struct file *file, void *fh, struct v4l2_crop *crop) | |||
792 | } | 791 | } |
793 | 792 | ||
794 | static int | 793 | static int |
795 | isp_video_set_crop(struct file *file, void *fh, struct v4l2_crop *crop) | 794 | isp_video_set_crop(struct file *file, void *fh, const struct v4l2_crop *crop) |
796 | { | 795 | { |
797 | struct isp_video *video = video_drvdata(file); | 796 | struct isp_video *video = video_drvdata(file); |
798 | struct v4l2_subdev *subdev; | 797 | struct v4l2_subdev *subdev; |