summaryrefslogtreecommitdiffstats
path: root/configs
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-07-01 10:57:29 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2020-07-01 10:57:29 +0200
commit9b669b9921eb2518d4c4ec12537b04b12a461a52 (patch)
tree2b1fb77caa4680c7b7e66a64a264370818c3dfda /configs
parent3c433e83b2a50f478fb1e3eb2fcd89c85e4902bb (diff)
parentbf5b588422a50d970ea8660d368cc6cdd2c377c9 (diff)
downloadkernel-9b669b9921eb2518d4c4ec12537b04b12a461a52.tar.gz
kernel-9b669b9921eb2518d4c4ec12537b04b12a461a52.tar.xz
kernel-9b669b9921eb2518d4c4ec12537b04b12a461a52.zip
Merge remote-tracking branch 'origin/stabilization' into stabilization-user-thl-vanilla-fedora
Diffstat (limited to 'configs')
-rw-r--r--configs/fedora/generic/CONFIG_DRM_PANEL_ROCKTECH_JH057N009001
-rw-r--r--configs/fedora/generic/CONFIG_DRM_PANEL_SITRONIX_ST77031
-rw-r--r--configs/fedora/generic/CONFIG_DRM_PANEL_XINGBANGDA_XBD5991
-rw-r--r--configs/fedora/generic/CONFIG_SERIAL_SC16IS7XX_I2C2
-rw-r--r--configs/fedora/generic/arm/aarch64/CONFIG_DRM_PANEL_XINGBANGDA_XBD5991
5 files changed, 2 insertions, 4 deletions
diff --git a/configs/fedora/generic/CONFIG_DRM_PANEL_ROCKTECH_JH057N00900 b/configs/fedora/generic/CONFIG_DRM_PANEL_ROCKTECH_JH057N00900
deleted file mode 100644
index 070c7734f..000000000
--- a/configs/fedora/generic/CONFIG_DRM_PANEL_ROCKTECH_JH057N00900
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_PANEL_ROCKTECH_JH057N00900=m
diff --git a/configs/fedora/generic/CONFIG_DRM_PANEL_SITRONIX_ST7703 b/configs/fedora/generic/CONFIG_DRM_PANEL_SITRONIX_ST7703
new file mode 100644
index 000000000..aa14cabc0
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_DRM_PANEL_SITRONIX_ST7703
@@ -0,0 +1 @@
+CONFIG_DRM_PANEL_SITRONIX_ST7703=m
diff --git a/configs/fedora/generic/CONFIG_DRM_PANEL_XINGBANGDA_XBD599 b/configs/fedora/generic/CONFIG_DRM_PANEL_XINGBANGDA_XBD599
deleted file mode 100644
index b3e186e66..000000000
--- a/configs/fedora/generic/CONFIG_DRM_PANEL_XINGBANGDA_XBD599
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_DRM_PANEL_XINGBANGDA_XBD599 is not set
diff --git a/configs/fedora/generic/CONFIG_SERIAL_SC16IS7XX_I2C b/configs/fedora/generic/CONFIG_SERIAL_SC16IS7XX_I2C
index 725798c75..80373470c 100644
--- a/configs/fedora/generic/CONFIG_SERIAL_SC16IS7XX_I2C
+++ b/configs/fedora/generic/CONFIG_SERIAL_SC16IS7XX_I2C
@@ -1 +1 @@
-CONFIG_SERIAL_SC16IS7XX_I2C=y
+# CONFIG_SERIAL_SC16IS7XX_I2C is not set
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_DRM_PANEL_XINGBANGDA_XBD599 b/configs/fedora/generic/arm/aarch64/CONFIG_DRM_PANEL_XINGBANGDA_XBD599
deleted file mode 100644
index aba5e985e..000000000
--- a/configs/fedora/generic/arm/aarch64/CONFIG_DRM_PANEL_XINGBANGDA_XBD599
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_PANEL_XINGBANGDA_XBD599=m