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-armv7hl-lpae-debug-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-armv7hl-lpae-debug-fedora.config')
-rw-r--r-- | kernel-armv7hl-lpae-debug-fedora.config | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index 13df7fe36..cdd4e2107 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -2642,6 +2642,7 @@ CONFIG_I2C_NFORCE2=m CONFIG_I2C_NVIDIA_GPU=m # CONFIG_I2C_OCORES is not set CONFIG_I2C_OMAP=y +# CONFIG_I2C_PARPORT_LIGHT is not set CONFIG_I2C_PCA_PLATFORM=m # CONFIG_I2C_PIIX4 is not set CONFIG_I2C_PXA=m @@ -2925,7 +2926,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 @@ -4853,7 +4853,6 @@ CONFIG_PARAVIRT=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 is not set @@ -6889,7 +6888,6 @@ CONFIG_SPI_BCM2835AUX=m CONFIG_SPI_BCM2835=m # CONFIG_SPI_BCM_QSPI is not set CONFIG_SPI_BITBANG=m -# CONFIG_SPI_BUTTERFLY is not set CONFIG_SPI_CADENCE=m # CONFIG_SPI_CADENCE_QUADSPI is not set CONFIG_SPI_DAVINCI=m @@ -6907,7 +6905,6 @@ CONFIG_SPI_GPIO=m # CONFIG_SPI_HISI_SFC_V3XX is not set CONFIG_SPI_IMX=m # CONFIG_SPI_LANTIQ_SSC is not set -# CONFIG_SPI_LM70_LLP is not set # CONFIG_SPI_LOOPBACK_TEST is not set CONFIG_SPI_MASTER=y CONFIG_SPI_MEM=y |