summaryrefslogtreecommitdiffstats
path: root/kernel-aarch64-fedora.config
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-03-31 06:42:34 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2020-03-31 06:42:34 +0200
commit7834203ee612d96611f18de10d508381394e620f (patch)
treebdf979bc3d10214531513b78f39dde0c55d674cc /kernel-aarch64-fedora.config
parentcd197a771bb60069854d866dff07b318d4574297 (diff)
parentcd64a637b84619fd14311bb8d08f7928892f407c (diff)
downloadkernel-7834203ee612d96611f18de10d508381394e620f.tar.gz
kernel-7834203ee612d96611f18de10d508381394e620f.tar.xz
kernel-7834203ee612d96611f18de10d508381394e620f.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.7.0-0.rc0.git1.1.vanilla.knurd.1.fc32
Diffstat (limited to 'kernel-aarch64-fedora.config')
-rw-r--r--kernel-aarch64-fedora.config2
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index a46de2b98..24689703c 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -1753,6 +1753,7 @@ CONFIG_ECRYPT_FS=m
# CONFIG_ECRYPT_FS_MESSAGING is not set
CONFIG_EDAC_BLUEFIELD=m
# CONFIG_EDAC_DEBUG is not set
+CONFIG_EDAC_DMC520=m
CONFIG_EDAC_GHES=y
CONFIG_EDAC_LAYERSCAPE=m
CONFIG_EDAC_LEGACY_SYSFS=y
@@ -5540,6 +5541,7 @@ CONFIG_SENSORS_ARM_SCPI=m
CONFIG_SENSORS_ASC7621=m
CONFIG_SENSORS_ASPEED=m
CONFIG_SENSORS_ATXP1=m
+CONFIG_SENSORS_AXI_FAN_CONTROL=m
CONFIG_SENSORS_BEL_PFE=m
CONFIG_SENSORS_BH1770=m
CONFIG_SENSORS_DME1737=m