diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-01-25 15:05:26 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-01-25 15:05:26 +0100 |
| commit | 7859ab724d58cefe5f67aeec124388dca72c5287 (patch) | |
| tree | e49a2cae320677c6ba1c785a0b3f1b9f16007138 /kernel-s390x-zfcpdump-rhel.config | |
| parent | c779498982daf5b78f0f0471f44328c5003ef8e8 (diff) | |
| parent | 1af963ae315471dd7486b5edc6eae85c853df7d3 (diff) | |
| download | kernel-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-s390x-zfcpdump-rhel.config')
| -rw-r--r-- | kernel-s390x-zfcpdump-rhel.config | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 104ef06a1..d384bd86f 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -182,6 +182,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 @@ -1367,7 +1368,7 @@ CONFIG_EARLY_PRINTK_USB_XDBC=y CONFIG_EDAC_DMC520=m CONFIG_EDAC_GHES=y CONFIG_EDAC_I10NM=m -# CONFIG_EDAC_IGEN6 is not set +CONFIG_EDAC_IGEN6=m # CONFIG_EDAC is not set CONFIG_EDAC_LEGACY_SYSFS=y CONFIG_EDAC_PND2=m @@ -2847,7 +2848,7 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 # CONFIG_MFD_HI655X_PMIC is not set # 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 @@ -5938,7 +5939,7 @@ CONFIG_USERFAULTFD=y # CONFIG_USERIO is not set CONFIG_USER_NS=y CONFIG_UTS_NS=y -# CONFIG_UV_SYSFS is not set +CONFIG_UV_SYSFS=y CONFIG_UWB_HWA=m CONFIG_UWB_I1480U=m # CONFIG_UWB is not set |