diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-04-08 06:27:25 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-04-08 06:27:25 +0200 |
| commit | c9ee4971d9f95f495cb9645851e8d47073ae0e20 (patch) | |
| tree | 7f00dc8f1f498e2e9ab41689496a966159670700 /kernel-s390x-fedora.config | |
| parent | 3bb63fa7872e911bdf13d1822719f83310fab24d (diff) | |
| parent | 2db8df88f66eacaa9bec1995431388fb3a044566 (diff) | |
| download | kernel-c9ee4971d9f95f495cb9645851e8d47073ae0e20.tar.gz kernel-c9ee4971d9f95f495cb9645851e8d47073ae0e20.tar.xz kernel-c9ee4971d9f95f495cb9645851e8d47073ae0e20.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.12.0-0.rc6.20210407git2d743660786e.185.vanilla.1.fc34
Diffstat (limited to 'kernel-s390x-fedora.config')
| -rw-r--r-- | kernel-s390x-fedora.config | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 29581177a..845b86cf8 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -2137,6 +2137,7 @@ CONFIG_I2C_MUX_MLXCPLD=m # CONFIG_I2C_NFORCE2_S4985 is not set CONFIG_I2C_NVIDIA_GPU=m # CONFIG_I2C_OCORES is not set +# CONFIG_I2C_PARPORT_LIGHT is not set # CONFIG_I2C_PCA_PLATFORM is not set # CONFIG_I2C_PIIX4 is not set # CONFIG_I2C_QCOM_CCI is not set @@ -2382,7 +2383,6 @@ CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY=y # CONFIG_INTEL_IDMA64 is not set CONFIG_INTEL_IDXD=m -# CONFIG_INTEL_IDXD_SVM is not set # CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set # CONFIG_INTEL_LDMA is not set # CONFIG_INTEL_MEI_VIRTIO is not set @@ -4107,7 +4107,6 @@ CONFIG_PANTHERLORD_FF=y # CONFIG_PARIDE is not set CONFIG_PARMAN=m # CONFIG_PARPORT is not set -# CONFIG_PARPORT_PANEL is not set # CONFIG_PARPORT_PC is not set CONFIG_PARTITION_ADVANCED=y CONFIG_PATA_ALI=m @@ -5770,7 +5769,6 @@ CONFIG_SPEAKUP_SYNTH_TXPRT=m CONFIG_SPI_AMD=y # CONFIG_SPI_AXI_SPI_ENGINE is not set # CONFIG_SPI_BITBANG is not set -# CONFIG_SPI_BUTTERFLY is not set # CONFIG_SPI_CADENCE is not set # CONFIG_SPI_CADENCE_QUADSPI is not set # CONFIG_SPI_DEBUG is not set @@ -5782,7 +5780,6 @@ CONFIG_SPI_FSL_LPSPI=m # CONFIG_SPI_HISI_SFC_V3XX is not set # CONFIG_SPI is not set # CONFIG_SPI_LANTIQ_SSC is not set -# CONFIG_SPI_LM70_LLP is not set # CONFIG_SPI_LOOPBACK_TEST is not set # CONFIG_SPI_MEM is not set # CONFIG_SPI_MTK_QUADSPI is not set |