diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-03 19:41:29 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-03 19:41:29 +0200 |
commit | d5e4e88fb9466ff04a7cd07c1ae8323bbbc36b8b (patch) | |
tree | c65252590fb6e2a4c89ec881c8c646cb9b4baa7a /kernel-x86_64-fedora.config | |
parent | c17e4efdaf48eb515ed385916912eeb973fbed66 (diff) | |
parent | 49d6a971ac73ed6e56c93207c43272f54630d01b (diff) | |
download | kernel-5.8.0-0.rc0.20200603gitf359287765c0.1.vanilla.1.fc32.tar.gz kernel-5.8.0-0.rc0.20200603gitf359287765c0.1.vanilla.1.fc32.tar.xz kernel-5.8.0-0.rc0.20200603gitf359287765c0.1.vanilla.1.fc32.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc0.20200603gitf359287765c0.1.vanilla.1.fc33kernel-5.8.0-0.rc0.20200603gitf359287765c0.1.vanilla.1.fc32kernel-5.8.0-0.rc0.20200603gitf359287765c0.1.vanilla.1.fc31
Diffstat (limited to 'kernel-x86_64-fedora.config')
-rw-r--r-- | kernel-x86_64-fedora.config | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 582bcf04d..fc015795c 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -5128,7 +5128,7 @@ CONFIG_SENSORS_ADT7462=m CONFIG_SENSORS_ADT7470=m CONFIG_SENSORS_ADT7475=m CONFIG_SENSORS_AMC6821=m -CONFIG_SENSORS_AMD_ENERGY=m +# CONFIG_SENSORS_AMD_ENERGY is not set CONFIG_SENSORS_APDS990X=m CONFIG_SENSORS_APPLESMC=m # CONFIG_SENSORS_AS370 is not set @@ -5851,7 +5851,7 @@ CONFIG_SPARSEMEM_VMEMMAP=y CONFIG_SPARSEMEM=y # CONFIG_SPEAKUP is not set # CONFIG_SPI_ALTERA is not set -CONFIG_SPI_AMD=m +# CONFIG_SPI_AMD is not set # CONFIG_SPI_AXI_SPI_ENGINE is not set # CONFIG_SPI_BITBANG is not set # CONFIG_SPI_BUTTERFLY is not set |