diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-12-12 19:42:26 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-12-12 19:42:26 +0100 |
| commit | ee4f70818324edbf5258381796275c7941857395 (patch) | |
| tree | 1e6303051949ee28c4d20ffdc6fe4d371a3df361 /kernel-s390x-fedora.config | |
| parent | 0fb08a81718e310fb0ef148b97be4030c5a26ec5 (diff) | |
| parent | 17322a1f6ae8d662d9605806dbd924208dec8325 (diff) | |
| download | kernel-ee4f70818324edbf5258381796275c7941857395.tar.gz kernel-ee4f70818324edbf5258381796275c7941857395.tar.xz kernel-ee4f70818324edbf5258381796275c7941857395.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.5.0-0.rc1.git2.1.vanilla.knurd.1.fc31kernel-5.5.0-0.rc1.git2.1.vanilla.knurd.1.fc30
Diffstat (limited to 'kernel-s390x-fedora.config')
| -rw-r--r-- | kernel-s390x-fedora.config | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index c192e4f26..9262ddacb 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -1529,8 +1529,6 @@ CONFIG_FSI_MASTER_HUB=m # CONFIG_FSI_SBEFIFO is not set CONFIG_FSI_SCOM=m # CONFIG_FSL_EDMA is not set -# CONFIG_FSL_ENETC_MDIO is not set -CONFIG_FSL_ENETC_QOS=y # CONFIG_FSL_PQ_MDIO is not set # CONFIG_FSL_QDMA is not set CONFIG_FS_MBCACHE=y @@ -2939,7 +2937,7 @@ CONFIG_MMC_SDHCI_ACPI=m CONFIG_MMC_SDHCI_CADENCE=m # CONFIG_MMC_SDHCI_F_SDH30 is not set CONFIG_MMC_SDHCI=m -CONFIG_MMC_SDHCI_MILBEAUT=m +# CONFIG_MMC_SDHCI_MILBEAUT is not set # CONFIG_MMC_SDHCI_OF_ARASAN is not set # CONFIG_MMC_SDHCI_OF_ASPEED is not set # CONFIG_MMC_SDHCI_OF_AT91 is not set @@ -3996,7 +3994,6 @@ CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QCOM_HIDMA is not set # CONFIG_QCOM_HIDMA_MGMT is not set # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set -# CONFIG_QCS_Q6SSTOP_404 is not set # CONFIG_QCS_TURING_404 is not set CONFIG_QDIO=m CONFIG_QEDE=m @@ -4960,7 +4957,6 @@ CONFIG_SND_SOC_AK5558=m CONFIG_SND_SOC_AMD_ACP=m CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m -# CONFIG_SND_SOC_ARNDALE_RT5631_ALC5631 is not set CONFIG_SND_SOC_BD28623=m # CONFIG_SND_SOC_BT_SCO is not set # CONFIG_SND_SOC_CS35L32 is not set @@ -5257,7 +5253,6 @@ CONFIG_SYN_COOKIES=y # CONFIG_SYSCON_REBOOT_MODE is not set CONFIG_SYSCTL=y # CONFIG_SYSFS_DEPRECATED is not set -CONFIG_SYSTEM76_ACPI=m CONFIG_SYSTEM_BLACKLIST_HASH_LIST="" CONFIG_SYSTEM_BLACKLIST_KEYRING=y # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set @@ -5484,7 +5479,6 @@ CONFIG_TOUCHSCREEN_ST1232=m # CONFIG_TOUCHSCREEN_SUR40 is not set # CONFIG_TOUCHSCREEN_SURFACE3_SPI is not set # CONFIG_TOUCHSCREEN_SX8654 is not set -CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m CONFIG_TOUCHSCREEN_TOUCHIT213=m CONFIG_TOUCHSCREEN_TOUCHRIGHT=m CONFIG_TOUCHSCREEN_TOUCHWIN=m @@ -6246,4 +6240,3 @@ CONFIG_ZRAM=m CONFIG_ZSMALLOC=y CONFIG_ZSWAP=y # CONFIG_ZX_TDM is not set -# CONFIG_ZYNQMP_FIRMWARE_DEBUG is not set |