diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2014-08-09 13:43:05 +0200 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-08-09 16:42:28 +0200 |
commit | 9eb338787fa1183183a371c63f98488c4ddc1104 (patch) | |
tree | d20c83a8c658bb10502ed1bf8e05b98bd4413bbc /patches/collateral-evolutions/media/0002-no_dmabuf/v4l2.patch | |
parent | 00d3fc79b53d1f9ddf88edbb81a71391a9bfffd7 (diff) |
backports: refresh patches on next-20140808
1 3.0.101 [ OK ]
2 3.1.10 [ OK ]
3 3.2.62 [ OK ]
4 3.3.8 [ OK ]
5 3.4.102 [ OK ]
6 3.5.7 [ OK ]
7 3.6.11 [ OK ]
8 3.7.10 [ OK ]
9 3.8.13 [ OK ]
10 3.9.11 [ OK ]
11 3.10.52 [ OK ]
12 3.11.10 [ OK ]
13 3.12.26 [ OK ]
14 3.13.11 [ OK ]
15 3.14.16 [ OK ]
16 3.15.7 [ OK ]
17 3.16.0 [ OK ]
Manual changes were done to:
patches/collateral-evolutions/network/0006-ieee802154-6lowpan-namespace.patch
This patch was removed:
patches/collateral-evolutions/network/0009-inet_frag_evictor.patch
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 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/patches/collateral-evolutions/media/0002-no_dmabuf/v4l2.patch b/patches/collateral-evolutions/media/0002-no_dmabuf/v4l2.patch index 1ccc455e..a6f4bf5e 100644 --- a/patches/collateral-evolutions/media/0002-no_dmabuf/v4l2.patch +++ b/patches/collateral-evolutions/media/0002-no_dmabuf/v4l2.patch @@ -188,7 +188,7 @@ /** * vb2_mmap() - map video buffers into application address space -@@ -3324,6 +3342,7 @@ int vb2_ioctl_streamoff(struct file *fil +@@ -3331,6 +3349,7 @@ int vb2_ioctl_streamoff(struct file *fil } EXPORT_SYMBOL_GPL(vb2_ioctl_streamoff); @@ -196,7 +196,7 @@ int vb2_ioctl_expbuf(struct file *file, void *priv, struct v4l2_exportbuffer *p) { struct video_device *vdev = video_devdata(file); -@@ -3333,6 +3352,7 @@ int vb2_ioctl_expbuf(struct file *file, +@@ -3340,6 +3359,7 @@ int vb2_ioctl_expbuf(struct file *file, return vb2_expbuf(vdev->queue, p); } EXPORT_SYMBOL_GPL(vb2_ioctl_expbuf); @@ -363,7 +363,7 @@ void *(*vaddr)(void *buf_priv); void *(*cookie)(void *buf_priv); -@@ -449,7 +453,9 @@ void vb2_queue_release(struct vb2_queue +@@ -453,7 +457,9 @@ void vb2_queue_release(struct vb2_queue void vb2_queue_error(struct vb2_queue *q); int vb2_qbuf(struct vb2_queue *q, struct v4l2_buffer *b); @@ -373,7 +373,7 @@ int vb2_dqbuf(struct vb2_queue *q, struct v4l2_buffer *b, bool nonblocking); int vb2_streamon(struct vb2_queue *q, enum v4l2_buf_type type); -@@ -605,8 +611,10 @@ int vb2_ioctl_qbuf(struct file *file, vo +@@ -609,8 +615,10 @@ int vb2_ioctl_qbuf(struct file *file, vo int vb2_ioctl_dqbuf(struct file *file, void *priv, struct v4l2_buffer *p); int vb2_ioctl_streamon(struct file *file, void *priv, enum v4l2_buf_type i); int vb2_ioctl_streamoff(struct file *file, void *priv, enum v4l2_buf_type i); |