aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil-cisco@xs4all.nl>2019-05-29 06:20:12 (GMT)
committerHans Verkuil <hverkuil-cisco@xs4all.nl>2019-05-29 06:20:12 (GMT)
commitb292a7f58a1cceb0c85a3026b4c15e470d149061 (patch)
tree465d96aeaf26373dfb728584de67db6b682696d8
parent483b4f0f48283ddaf1ba54d079051b58cdff2ef9 (diff)
Update backport patches
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
-rw-r--r--backports/api_version.patch6
-rw-r--r--backports/pr_fmt.patch6
-rw-r--r--backports/v3.18_drop_property_h.patch6
-rw-r--r--backports/v3.1_no_export_h.patch6
-rw-r--r--backports/v4.10_refcount.patch6
5 files changed, 15 insertions, 15 deletions
diff --git a/backports/api_version.patch b/backports/api_version.patch
index 23e43ef..0e8ff64 100644
--- a/backports/api_version.patch
+++ b/backports/api_version.patch
@@ -5,10 +5,10 @@ index b6536bbad530..401ed65c834b 100644
@@ -85 +85 @@ static long cec_adap_g_caps(struct cec_adapter *adap,
- caps.version = LINUX_VERSION_CODE;
+ caps.version = V4L2_VERSION;
-diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c
+diff --git a/drivers/media/mc/mc-device.c b/drivers/media/mc/mc-device.c
index 3bae24b15eaa..7f7cc64c637c 100644
---- a/drivers/media/media-device.c
-+++ b/drivers/media/media-device.c
+--- a/drivers/media/mc/mc-device.c
++++ b/drivers/media/mc/mc-device.c
@@ -81 +81 @@ static long media_device_get_info(struct media_device *dev, void *arg)
- info->media_version = LINUX_VERSION_CODE;
+ info->media_version = V4L2_VERSION;
diff --git a/backports/pr_fmt.patch b/backports/pr_fmt.patch
index c74499a..7975ce4 100644
--- a/backports/pr_fmt.patch
+++ b/backports/pr_fmt.patch
@@ -250,10 +250,10 @@ index a39bbd8ff1f0..b516625205ff 100644
+#undef pr_fmt
#define pr_fmt(fmt) KBUILD_MODNAME ": %s: " fmt, __func__
-diff --git a/drivers/media/media-devnode.c b/drivers/media/media-devnode.c
+diff --git a/drivers/media/mc/mc-devnode.c b/drivers/media/mc/mc-devnode.c
index 6b87a721dc49..77dac01e7705 100644
---- a/drivers/media/media-devnode.c
-+++ b/drivers/media/media-devnode.c
+--- a/drivers/media/mc/mc-devnode.c
++++ b/drivers/media/mc/mc-devnode.c
@@ -28,2 +28,3 @@
+#undef pr_fmt
diff --git a/backports/v3.18_drop_property_h.patch b/backports/v3.18_drop_property_h.patch
index b367154..6acda1e 100644
--- a/backports/v3.18_drop_property_h.patch
+++ b/backports/v3.18_drop_property_h.patch
@@ -1,7 +1,7 @@
-diff --git a/drivers/media/media-entity.c b/drivers/media/media-entity.c
+diff --git a/drivers/media/mc/mc-entity.c b/drivers/media/mc/mc-entity.c
index a998a2e0ea1d..9fa66a2dee00 100644
---- a/drivers/media/media-entity.c
-+++ b/drivers/media/media-entity.c
+--- a/drivers/media/mc/mc-entity.c
++++ b/drivers/media/mc/mc-entity.c
@@ -17,7 +17,6 @@
*/
diff --git a/backports/v3.1_no_export_h.patch b/backports/v3.1_no_export_h.patch
index ae4cfe1..afd0b6b 100644
--- a/backports/v3.1_no_export_h.patch
+++ b/backports/v3.1_no_export_h.patch
@@ -34,10 +34,10 @@ index bfe831c10b1c..d1aa20e6f0cd 100644
#include <asm/byteorder.h>
#include "smsendian.h"
-diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c
+diff --git a/drivers/media/mc/mc-device.c b/drivers/media/mc/mc-device.c
index 760e3e424e23..feb5d759711b 100644
---- a/drivers/media/media-device.c
-+++ b/drivers/media/media-device.c
+--- a/drivers/media/mc/mc-device.c
++++ b/drivers/media/mc/mc-device.c
@@ -20,7 +20,6 @@
#define __NEED_MEDIA_LEGACY_API
diff --git a/backports/v4.10_refcount.patch b/backports/v4.10_refcount.patch
index cd9f870..6787bb2 100644
--- a/backports/v4.10_refcount.patch
+++ b/backports/v4.10_refcount.patch
@@ -195,10 +195,10 @@ index 6dfbd5b05907..03aae4744a9c 100644
return dbuf;
}
-diff --git a/drivers/media/media-request.c b/drivers/media/media-request.c
+diff --git a/drivers/media/mc/mc-request.c b/drivers/media/mc/mc-request.c
index 4e9db1fed697..860ba64c4554 100644
---- a/drivers/media/media-request.c
-+++ b/drivers/media/media-request.c
+--- a/drivers/media/mc/mc-request.c
++++ b/drivers/media/mc/mc-request.c
@@ -12,7 +12,6 @@
#include <linux/anon_inodes.h>

Privacy Policy