Home Home > GIT Browse > vanilla
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKernel Build Daemon <kbuild@suse.de>2018-12-14 12:01:56 +0100
committerKernel Build Daemon <kbuild@suse.de>2018-12-14 12:01:56 +0100
commit4603d2a052e19c9308f7324f0742b2cd3a57905b (patch)
treef98903c43ff090d92851f035faec2841ba467c12
parentcfdb3784d547ab9c70b4635b4be93ed4d17f3c43 (diff)
Automatically updated to 4.20-rc6-82-g65e08c5e8631
-rw-r--r--config/arm64/vanilla1
-rw-r--r--config/armv7hl/vanilla1
-rw-r--r--rpm/config.sh2
3 files changed, 3 insertions, 1 deletions
diff --git a/config/arm64/vanilla b/config/arm64/vanilla
index bdde0f136a..ca6cbff023 100644
--- a/config/arm64/vanilla
+++ b/config/arm64/vanilla
@@ -5199,6 +5199,7 @@ CONFIG_MEDIA_CEC_SUPPORT=y
# CONFIG_CEC_PIN_ERROR_INJ is not set
CONFIG_MEDIA_CONTROLLER=y
# CONFIG_MEDIA_CONTROLLER_DVB is not set
+CONFIG_MEDIA_CONTROLLER_REQUEST_API=y
CONFIG_VIDEO_DEV=m
# CONFIG_VIDEO_V4L2_SUBDEV_API is not set
CONFIG_VIDEO_V4L2=m
diff --git a/config/armv7hl/vanilla b/config/armv7hl/vanilla
index 02b16d370f..c4682e5535 100644
--- a/config/armv7hl/vanilla
+++ b/config/armv7hl/vanilla
@@ -5351,6 +5351,7 @@ CONFIG_MEDIA_CEC_SUPPORT=y
# CONFIG_CEC_PIN_ERROR_INJ is not set
CONFIG_MEDIA_CONTROLLER=y
# CONFIG_MEDIA_CONTROLLER_DVB is not set
+CONFIG_MEDIA_CONTROLLER_REQUEST_API=y
CONFIG_VIDEO_DEV=m
CONFIG_VIDEO_V4L2_SUBDEV_API=y
CONFIG_VIDEO_V4L2=m
diff --git a/rpm/config.sh b/rpm/config.sh
index 14d2423a5c..079866fb39 100644
--- a/rpm/config.sh
+++ b/rpm/config.sh
@@ -1,5 +1,5 @@
# The version of the main tarball to use
-SRCVERSION=4.20-rc6-25-gf5d582777bcb
+SRCVERSION=4.20-rc6-82-g65e08c5e8631
# variant of the kernel-source package, either empty or "-rt"
VARIANT=
# Set to 1 if the tree does not contain any non-vanilla patches at all