diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2015-04-18 15:49:55 +0200 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2015-04-25 15:44:26 +0200 |
commit | 8f5a4122c86a8fbd78098ec2c83ed5342281610a (patch) | |
tree | d04162c804d06cec68007ee8fbde4f046f669ce5 /patches/collateral-evolutions/media | |
parent | 95411f9653a8435c172d47ce3a9d84985a8ba3e1 (diff) |
patches: refresh patches on next-20150402backports-20150402
1 3.0.101 [ OK ]
2 3.1.10 [ OK ]
3 3.2.68 [ OK ]
4 3.3.8 [ OK ]
5 3.4.106 [ 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.73 [ OK ]
12 3.11.10 [ OK ]
13 3.12.39 [ OK ]
14 3.13.11 [ OK ]
15 3.14.37 [ OK ]
16 3.15.10 [ OK ]
17 3.16.7 [ OK ]
18 3.17.8 [ OK ]
19 3.18.10 [ OK ]
20 3.19.3 [ OK ]
21 4.0-rc6 [ OK ]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/collateral-evolutions/media')
3 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 732fac06..484b3a32 100644 --- a/patches/collateral-evolutions/media/0002-no_dmabuf/v4l2.patch +++ b/patches/collateral-evolutions/media/0002-no_dmabuf/v4l2.patch @@ -498,7 +498,7 @@ .vidioc_streamoff = v4l2_m2m_ioctl_streamoff, --- a/drivers/media/usb/au0828/au0828-video.c +++ b/drivers/media/usb/au0828/au0828-video.c -@@ -1678,7 +1678,9 @@ static const struct v4l2_ioctl_ops video +@@ -1666,7 +1666,9 @@ static const struct v4l2_ioctl_ops video .vidioc_querybuf = vb2_ioctl_querybuf, .vidioc_qbuf = vb2_ioctl_qbuf, .vidioc_dqbuf = vb2_ioctl_dqbuf, diff --git a/patches/collateral-evolutions/media/0003-devnode_param_type/dvb-core.patch b/patches/collateral-evolutions/media/0003-devnode_param_type/dvb-core.patch index 3b4385e8..0ab19600 100644 --- a/patches/collateral-evolutions/media/0003-devnode_param_type/dvb-core.patch +++ b/patches/collateral-evolutions/media/0003-devnode_param_type/dvb-core.patch @@ -1,6 +1,6 @@ --- a/drivers/media/dvb-core/dvbdev.c +++ b/drivers/media/dvb-core/dvbdev.c -@@ -442,7 +442,11 @@ static int dvb_uevent(struct device *dev +@@ -584,7 +584,11 @@ static int dvb_uevent(struct device *dev return 0; } diff --git a/patches/collateral-evolutions/media/0004-missing-include/ir-hix5hd2.patch b/patches/collateral-evolutions/media/0004-missing-include/ir-hix5hd2.patch index e7891f8d..92368fa7 100644 --- a/patches/collateral-evolutions/media/0004-missing-include/ir-hix5hd2.patch +++ b/patches/collateral-evolutions/media/0004-missing-include/ir-hix5hd2.patch @@ -6,5 +6,5 @@ #include <media/rc-core.h> +#include <linux/of.h> - /* Allow the driver to compile on all architectures */ - #ifndef writel_relaxed + #define IR_ENABLE 0x00 + #define IR_CONFIG 0x04 |