summaryrefslogtreecommitdiffstats
path: root/0001-drm-panel-add-Xingbangda-XBD599-panel.patch
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-08-13 20:17:57 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2020-08-13 20:17:57 +0200
commitf05c02032c007399078784ea2ace322385f869b9 (patch)
tree7c1bd28f37be1d28a3c8ace051c55472ba8bdd63 /0001-drm-panel-add-Xingbangda-XBD599-panel.patch
parent55576abe986db86a9f4e2b105d2451800d652217 (diff)
parentf7a3bf654752fa0e92c7ab3e57e48d3415632852 (diff)
downloadkernel-f05c02032c007399078784ea2ace322385f869b9.tar.gz
kernel-f05c02032c007399078784ea2ace322385f869b9.tar.xz
kernel-f05c02032c007399078784ea2ace322385f869b9.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora
Diffstat (limited to '0001-drm-panel-add-Xingbangda-XBD599-panel.patch')
-rw-r--r--0001-drm-panel-add-Xingbangda-XBD599-panel.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/0001-drm-panel-add-Xingbangda-XBD599-panel.patch b/0001-drm-panel-add-Xingbangda-XBD599-panel.patch
index 6866d5f69..9e43122d3 100644
--- a/0001-drm-panel-add-Xingbangda-XBD599-panel.patch
+++ b/0001-drm-panel-add-Xingbangda-XBD599-panel.patch
@@ -17,7 +17,7 @@ Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
create mode 100644 drivers/gpu/drm/panel/panel-xingbangda-xbd599.c
diff --git a/drivers/gpu/drm/panel/Kconfig b/drivers/gpu/drm/panel/Kconfig
-index 39055c1f0e2f..1f55a87bb657 100644
+index de2f2a452be5..3ce658de416b 100644
--- a/drivers/gpu/drm/panel/Kconfig
+++ b/drivers/gpu/drm/panel/Kconfig
@@ -462,6 +462,15 @@ config DRM_PANEL_VISIONOX_RM69299
@@ -37,7 +37,7 @@ index 39055c1f0e2f..1f55a87bb657 100644
tristate "Xinpeng XPP055C272 panel driver"
depends on OF
diff --git a/drivers/gpu/drm/panel/Makefile b/drivers/gpu/drm/panel/Makefile
-index de74f282c433..7b6b0c0397d6 100644
+index e45ceac6286f..bd10617430ec 100644
--- a/drivers/gpu/drm/panel/Makefile
+++ b/drivers/gpu/drm/panel/Makefile
@@ -49,4 +49,5 @@ obj-$(CONFIG_DRM_PANEL_TPO_TD043MTEA1) += panel-tpo-td043mtea1.o