summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-03-23 05:46:35 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2020-03-23 05:46:35 +0100
commitf7b5f27d067cee8b0e4d8037614bd78b980bf51a (patch)
tree7c588ed4fa6a3bd4ff4dac548feab6192df2cd89
parent2b1c0c48627fe757dafbd0c2c51ee6124e15181c (diff)
parent9f5dcfdbf8368555d5ff26cb32522955fd6ef9e2 (diff)
downloadkernel-f7b5f27d067cee8b0e4d8037614bd78b980bf51a.tar.gz
kernel-f7b5f27d067cee8b0e4d8037614bd78b980bf51a.tar.xz
kernel-f7b5f27d067cee8b0e4d8037614bd78b980bf51a.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora
-rw-r--r--configs/fedora/generic/CONFIG_DRM_PANEL_XINGBANGDA_XBD5991
-rw-r--r--configs/fedora/generic/arm/CONFIG_INA2XX_ADC (renamed from configs/fedora/generic/arm/aarch64/CONFIG_INA2XX_ADC)0
-rw-r--r--configs/fedora/generic/arm/aarch64/CONFIG_DRM_PANEL_XINGBANGDA_XBD5991
-rw-r--r--kernel-armv7hl-debug-fedora.config2
-rw-r--r--kernel-armv7hl-fedora.config2
-rw-r--r--kernel-armv7hl-lpae-debug-fedora.config2
-rw-r--r--kernel-armv7hl-lpae-fedora.config2
7 files changed, 6 insertions, 4 deletions
diff --git a/configs/fedora/generic/CONFIG_DRM_PANEL_XINGBANGDA_XBD599 b/configs/fedora/generic/CONFIG_DRM_PANEL_XINGBANGDA_XBD599
new file mode 100644
index 000000000..b3e186e66
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_DRM_PANEL_XINGBANGDA_XBD599
@@ -0,0 +1 @@
+# CONFIG_DRM_PANEL_XINGBANGDA_XBD599 is not set
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_INA2XX_ADC b/configs/fedora/generic/arm/CONFIG_INA2XX_ADC
index 32f6a0524..32f6a0524 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_INA2XX_ADC
+++ b/configs/fedora/generic/arm/CONFIG_INA2XX_ADC
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_DRM_PANEL_XINGBANGDA_XBD599 b/configs/fedora/generic/arm/aarch64/CONFIG_DRM_PANEL_XINGBANGDA_XBD599
new file mode 100644
index 000000000..aba5e985e
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_DRM_PANEL_XINGBANGDA_XBD599
@@ -0,0 +1 @@
+CONFIG_DRM_PANEL_XINGBANGDA_XBD599=m
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index b739293ff..c3994369d 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -2563,7 +2563,7 @@ CONFIG_IMX_SC_WDT=m
CONFIG_IMX_SDMA=m
CONFIG_IMX_THERMAL=m
CONFIG_IMX_WEIM=y
-# CONFIG_INA2XX_ADC is not set
+CONFIG_INA2XX_ADC=m
CONFIG_INET6_AH=m
CONFIG_INET6_ESP=m
CONFIG_INET6_ESP_OFFLOAD=m
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index 3ade340f2..ccc05f00a 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -2548,7 +2548,7 @@ CONFIG_IMX_SC_WDT=m
CONFIG_IMX_SDMA=m
CONFIG_IMX_THERMAL=m
CONFIG_IMX_WEIM=y
-# CONFIG_INA2XX_ADC is not set
+CONFIG_INA2XX_ADC=m
CONFIG_INET6_AH=m
CONFIG_INET6_ESP=m
CONFIG_INET6_ESP_OFFLOAD=m
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index dee41111b..1dd79f5fa 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -2503,7 +2503,7 @@ CONFIG_IMX_MBOX=m
CONFIG_IMX_SC_WDT=m
CONFIG_IMX_SDMA=m
# CONFIG_IMX_WEIM is not set
-# CONFIG_INA2XX_ADC is not set
+CONFIG_INA2XX_ADC=m
CONFIG_INET6_AH=m
CONFIG_INET6_ESP=m
CONFIG_INET6_ESP_OFFLOAD=m
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index 3c7a2ba7a..ad95f951f 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -2488,7 +2488,7 @@ CONFIG_IMX_MBOX=m
CONFIG_IMX_SC_WDT=m
CONFIG_IMX_SDMA=m
# CONFIG_IMX_WEIM is not set
-# CONFIG_INA2XX_ADC is not set
+CONFIG_INA2XX_ADC=m
CONFIG_INET6_AH=m
CONFIG_INET6_ESP=m
CONFIG_INET6_ESP_OFFLOAD=m