diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2014-12-20 22:49:39 +0100 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-12-21 17:13:23 +0100 |
commit | 69e344227777cad5d66f3ebd8ba87a7859b0ad30 (patch) | |
tree | dc7659524ad0a1119e435a584684ca6117ae2e9d /patches/collateral-evolutions/media/0002-no_dmabuf/v4l2.patch | |
parent | 162762a0b81419284260e0e30563859c9ace4c88 (diff) |
patches: refresh patches on next-20141221backports-20141221
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/collateral-evolutions/media/0002-no_dmabuf/v4l2.patch')
-rw-r--r-- | patches/collateral-evolutions/media/0002-no_dmabuf/v4l2.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/collateral-evolutions/media/0002-no_dmabuf/v4l2.patch b/patches/collateral-evolutions/media/0002-no_dmabuf/v4l2.patch index c7de4a07..c1f8f74f 100644 --- a/patches/collateral-evolutions/media/0002-no_dmabuf/v4l2.patch +++ b/patches/collateral-evolutions/media/0002-no_dmabuf/v4l2.patch @@ -284,7 +284,7 @@ }; static void vb2_vmalloc_put(void *buf_priv); -@@ -216,6 +218,7 @@ static int vb2_vmalloc_mmap(void *buf_pr +@@ -215,6 +217,7 @@ static int vb2_vmalloc_mmap(void *buf_pr /* DMABUF ops for exporters */ /*********************************************/ @@ -292,7 +292,7 @@ struct vb2_vmalloc_attachment { struct sg_table sgt; enum dma_data_direction dma_dir; -@@ -431,6 +434,7 @@ static void *vb2_vmalloc_attach_dmabuf(v +@@ -430,6 +433,7 @@ static void *vb2_vmalloc_attach_dmabuf(v return buf; } @@ -300,7 +300,7 @@ const struct vb2_mem_ops vb2_vmalloc_memops = { -@@ -438,11 +442,13 @@ const struct vb2_mem_ops vb2_vmalloc_mem +@@ -437,11 +441,13 @@ const struct vb2_mem_ops vb2_vmalloc_mem .put = vb2_vmalloc_put, .get_userptr = vb2_vmalloc_get_userptr, .put_userptr = vb2_vmalloc_put_userptr, |