diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2012-11-21 05:38:13 -0500 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2012-11-21 05:38:13 -0500 |
| commit | 851462444d421c223965b12b836bef63da61b57f (patch) | |
| tree | 495baa14e638817941496c36e1443aed7dae0ea0 /drivers/media/platform/fsl-viu.c | |
| parent | 5a6ea4af0907f995dc06df21a9c9ef764c7cd3bc (diff) | |
| parent | 6924d99fcdf1a688538a3cdebd1f135c22eec191 (diff) | |
Merge branch 'for-3.7' of git://git.infradead.org/users/dedekind/l2-mtd
Conflicts:
drivers/mtd/nand/nand_base.c
Diffstat (limited to 'drivers/media/platform/fsl-viu.c')
| -rw-r--r-- | drivers/media/platform/fsl-viu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/platform/fsl-viu.c b/drivers/media/platform/fsl-viu.c index 897250b88647..31ac4dc69247 100644 --- a/drivers/media/platform/fsl-viu.c +++ b/drivers/media/platform/fsl-viu.c | |||
| @@ -864,7 +864,7 @@ int vidioc_s_fbuf(struct file *file, void *priv, const struct v4l2_framebuffer * | |||
| 864 | { | 864 | { |
| 865 | struct viu_fh *fh = priv; | 865 | struct viu_fh *fh = priv; |
| 866 | struct viu_dev *dev = fh->dev; | 866 | struct viu_dev *dev = fh->dev; |
| 867 | struct v4l2_framebuffer *fb = arg; | 867 | const struct v4l2_framebuffer *fb = arg; |
| 868 | struct viu_fmt *fmt; | 868 | struct viu_fmt *fmt; |
| 869 | 869 | ||
| 870 | if (!capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_RAWIO)) | 870 | if (!capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_RAWIO)) |