Update backports for new cec core location

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
This commit is contained in:
Hans Verkuil
2020-04-16 08:39:04 +02:00
parent fc92fc8cec
commit 8ad929be3d
6 changed files with 21 additions and 21 deletions

View File

@@ -1,7 +1,7 @@
diff --git a/drivers/media/cec/cec-api.c b/drivers/media/cec/cec-api.c
diff --git a/drivers/media/cec/core/cec-api.c b/drivers/media/cec/core/cec-api.c
index b6536bbad530..401ed65c834b 100644
--- a/drivers/media/cec/cec-api.c
+++ b/drivers/media/cec/cec-api.c
--- a/drivers/media/cec/core/cec-api.c
+++ b/drivers/media/cec/core/cec-api.c
@@ -85 +85 @@ static long cec_adap_g_caps(struct cec_adapter *adap,
- caps.version = LINUX_VERSION_CODE;
+ caps.version = V4L2_VERSION;

View File

@@ -1,7 +1,7 @@
diff --git a/drivers/media/cec/cec-notifier.c b/drivers/media/cec/cec-notifier.c
diff --git a/drivers/media/cec/core/cec-notifier.c b/drivers/media/cec/core/cec-notifier.c
index 5f5209a73665..894399639fe5 100644
--- a/drivers/media/cec/cec-notifier.c
+++ b/drivers/media/cec/cec-notifier.c
--- a/drivers/media/cec/core/cec-notifier.c
+++ b/drivers/media/cec/core/cec-notifier.c
@@ -18,7 +18,6 @@
* SOFTWARE.
*/

View File

@@ -1,7 +1,7 @@
diff --git a/drivers/media/cec/cec-pin-error-inj.c b/drivers/media/cec/cec-pin-error-inj.c
diff --git a/drivers/media/cec/core/cec-pin-error-inj.c b/drivers/media/cec/core/cec-pin-error-inj.c
index 7132a27..93ccdc7 100644
--- a/drivers/media/cec/cec-pin-error-inj.c
+++ b/drivers/media/cec/cec-pin-error-inj.c
--- a/drivers/media/cec/core/cec-pin-error-inj.c
+++ b/drivers/media/cec/core/cec-pin-error-inj.c
@@ -5,7 +5,6 @@
#include <linux/delay.h>
@@ -10,10 +10,10 @@ index 7132a27..93ccdc7 100644
#include <media/cec-pin.h>
#include "cec-pin-priv.h"
diff --git a/drivers/media/cec/cec-pin.c b/drivers/media/cec/cec-pin.c
diff --git a/drivers/media/cec/core/cec-pin.c b/drivers/media/cec/core/cec-pin.c
index 6e31142..0f31537 100644
--- a/drivers/media/cec/cec-pin.c
+++ b/drivers/media/cec/cec-pin.c
--- a/drivers/media/cec/core/cec-pin.c
+++ b/drivers/media/cec/core/cec-pin.c
@@ -5,7 +5,6 @@
#include <linux/delay.h>

View File

@@ -1,7 +1,7 @@
diff --git a/drivers/media/cec/cec-adap.c b/drivers/media/cec/cec-adap.c
diff --git a/drivers/media/cec/core/cec-adap.c b/drivers/media/cec/core/cec-adap.c
index 33ba5cdde7e8..56e9ba5013fa 100644
--- a/drivers/media/cec/cec-adap.c
+++ b/drivers/media/cec/cec-adap.c
--- a/drivers/media/cec/core/cec-adap.c
+++ b/drivers/media/cec/core/cec-adap.c
@@ -19,7 +19,6 @@
#include <drm/drm_connector.h>
#include <drm/drmP.h>

View File

@@ -1,7 +1,7 @@
diff --git a/drivers/media/cec/cec-adap.c b/drivers/media/cec/cec-adap.c
diff --git a/drivers/media/cec/core/cec-adap.c b/drivers/media/cec/core/cec-adap.c
index 451c61bde4d4..33ba5cdde7e8 100644
--- a/drivers/media/cec/cec-adap.c
+++ b/drivers/media/cec/cec-adap.c
--- a/drivers/media/cec/core/cec-adap.c
+++ b/drivers/media/cec/core/cec-adap.c
@@ -17,7 +17,7 @@
#include <linux/types.h>

View File

@@ -1,7 +1,7 @@
diff --git a/drivers/media/cec/cec-adap.c b/drivers/media/cec/cec-adap.c
diff --git a/drivers/media/cec/core/cec-adap.c b/drivers/media/cec/core/cec-adap.c
index 56e9ba5013fa..e89903037f9c 100644
--- a/drivers/media/cec/cec-adap.c
+++ b/drivers/media/cec/cec-adap.c
--- a/drivers/media/cec/core/cec-adap.c
+++ b/drivers/media/cec/core/cec-adap.c
@@ -16,7 +16,7 @@
#include <linux/string.h>
#include <linux/types.h>