summaryrefslogtreecommitdiffstats
path: root/kernel-x86_64-rhel.config
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2021-01-25 15:05:26 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2021-01-25 15:05:26 +0100
commit7859ab724d58cefe5f67aeec124388dca72c5287 (patch)
treee49a2cae320677c6ba1c785a0b3f1b9f16007138 /kernel-x86_64-rhel.config
parentc779498982daf5b78f0f0471f44328c5003ef8e8 (diff)
parent1af963ae315471dd7486b5edc6eae85c853df7d3 (diff)
downloadkernel-7859ab724d58cefe5f67aeec124388dca72c5287.tar.gz
kernel-7859ab724d58cefe5f67aeec124388dca72c5287.tar.xz
kernel-7859ab724d58cefe5f67aeec124388dca72c5287.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.11.0-0.rc5.134.vanilla.1.fc34kernel-5.11.0-0.rc5.134.vanilla.1.fc33kernel-5.11.0-0.rc5.134.vanilla.1.fc32
Diffstat (limited to 'kernel-x86_64-rhel.config')
-rw-r--r--kernel-x86_64-rhel.config7
1 files changed, 4 insertions, 3 deletions
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index c2681d4cf..47b707704 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -204,6 +204,7 @@ CONFIG_AQUANTIA_PHY=m
# CONFIG_ARCH_AGILEX is not set
# CONFIG_ARCH_ALPINE is not set
# CONFIG_ARCH_BCM2835 is not set
+# CONFIG_ARCH_BCM4908 is not set
# CONFIG_ARCH_BITMAIN is not set
# CONFIG_ARCH_BRCMSTB is not set
# CONFIG_ARCH_KEEMBAY is not set
@@ -1437,7 +1438,7 @@ CONFIG_EDAC_I7300=m
CONFIG_EDAC_I7CORE=m
CONFIG_EDAC_I82975X=m
CONFIG_EDAC_IE31200=m
-# CONFIG_EDAC_IGEN6 is not set
+CONFIG_EDAC_IGEN6=m
CONFIG_EDAC_LEGACY_SYSFS=y
CONFIG_EDAC_PND2=m
CONFIG_EDAC_SBRIDGE=m
@@ -3010,7 +3011,7 @@ CONFIG_MFD_INTEL_LPSS_PCI=y
CONFIG_MFD_INTEL_LPSS=y
# CONFIG_MFD_INTEL_M10_BMC is not set
# CONFIG_MFD_INTEL_PMC_BXT is not set
-# CONFIG_MFD_INTEL_PMT is not set
+CONFIG_MFD_INTEL_PMT=m
# CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set
# CONFIG_MFD_IQS62X is not set
# CONFIG_MFD_JANZ_CMODIO is not set
@@ -6161,7 +6162,7 @@ CONFIG_USERFAULTFD=y
CONFIG_USER_NS=y
CONFIG_UTS_NS=y
CONFIG_UV_MMTIMER=m
-# CONFIG_UV_SYSFS is not set
+CONFIG_UV_SYSFS=y
CONFIG_UWB_HWA=m
CONFIG_UWB_I1480U=m
CONFIG_UWB=m