diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-08-27 16:43:48 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-08-27 16:43:48 +0200 |
| commit | 3b953159f7bf235aa6e2a3ec15c45ca94e753601 (patch) | |
| tree | 4e9bde78f15176656d6b1820d7e46f75ff989b15 /kernel-s390x-rhel.config | |
| parent | 8634aa00a4da93f2dede7b352bde9716672b24ef (diff) | |
| parent | 4594f2534fa269a516151f1a79953d27ac2ee8f6 (diff) | |
| download | kernel-3b953159f7bf235aa6e2a3ec15c45ca94e753601.tar.gz kernel-3b953159f7bf235aa6e2a3ec15c45ca94e753601.tar.xz kernel-3b953159f7bf235aa6e2a3ec15c45ca94e753601.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.14.0-0.rc7.20210827git77dd11439b86.57.vanilla.1.fc35
Diffstat (limited to 'kernel-s390x-rhel.config')
| -rw-r--r-- | kernel-s390x-rhel.config | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index ea514de21..bcd81f508 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -586,7 +586,6 @@ CONFIG_CAPI_AVM=y CONFIG_CARDBUS=y # CONFIG_CARL9170 is not set CONFIG_CAVIUM_ERRATUM_30115=y -CONFIG_CAVIUM_PTP=y CONFIG_CB710_CORE=m # CONFIG_CB710_DEBUG is not set CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y @@ -2675,8 +2674,6 @@ CONFIG_LIBFC=m CONFIG_LIBFCOE=m CONFIG_LIBNVDIMM=m # CONFIG_LIDAR_LITE_V2 is not set -CONFIG_LIQUIDIO=m -CONFIG_LIQUIDIO_VF=m CONFIG_LIRC=y # CONFIG_LITEX_SOC_CONTROLLER is not set CONFIG_LIVEPATCH=y @@ -2907,7 +2904,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=m +# CONFIG_MFD_INTEL_PMT is not set # CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set # CONFIG_MFD_IQS62X is not set # CONFIG_MFD_JANZ_CMODIO is not set @@ -3466,7 +3463,7 @@ CONFIG_NET_VENDOR_AQUANTIA=y # CONFIG_NET_VENDOR_BROADCOM is not set # CONFIG_NET_VENDOR_BROCADE is not set # CONFIG_NET_VENDOR_CADENCE is not set -CONFIG_NET_VENDOR_CAVIUM=y +# CONFIG_NET_VENDOR_CAVIUM is not set # CONFIG_NET_VENDOR_CHELSIO is not set # CONFIG_NET_VENDOR_CISCO is not set # CONFIG_NET_VENDOR_CORTINA is not set @@ -4085,7 +4082,6 @@ CONFIG_PSTORE=y # CONFIG_PTP_1588_CLOCK_INES is not set CONFIG_PTP_1588_CLOCK_KVM=m # CONFIG_PTP_1588_CLOCK_OCP is not set -# CONFIG_PTP_1588_CLOCK_VMW is not set CONFIG_PTP_1588_CLOCK=y # CONFIG_PUNIT_ATOM_DEBUG is not set # CONFIG_PVPANIC is not set @@ -4441,8 +4437,8 @@ CONFIG_RTL_CARDS=m # CONFIG_RTLWIFI_DEBUG is not set CONFIG_RTLWIFI=m # CONFIG_RTS5208 is not set -# CONFIG_RTW88_8723DE is not set -# CONFIG_RTW88_8821CE is not set +CONFIG_RTW88_8723DE=m +CONFIG_RTW88_8821CE=m CONFIG_RTW88_8822BE=m CONFIG_RTW88_8822CE=m # CONFIG_RTW88_DEBUGFS is not set @@ -5798,10 +5794,6 @@ CONFIG_THERMAL_OF=y # CONFIG_THERMAL_WRITABLE_TRIPS is not set # CONFIG_THINKPAD_LMI is not set # CONFIG_THRUSTMASTER_FF is not set -# CONFIG_THUNDER_NIC_BGX is not set -# CONFIG_THUNDER_NIC_PF is not set -# CONFIG_THUNDER_NIC_RGX is not set -# CONFIG_THUNDER_NIC_VF is not set CONFIG_THUNDERX2_PMU=m # CONFIG_TI_ADC081C is not set # CONFIG_TI_ADC0832 is not set @@ -6320,9 +6312,9 @@ CONFIG_UWB_I1480U=m # CONFIG_VCNL4035 is not set CONFIG_VDPA=m # CONFIG_VDPA_MENU is not set -# CONFIG_VDPA_SIM_BLOCK is not set +CONFIG_VDPA_SIM_BLOCK=m CONFIG_VDPA_SIM=m -# CONFIG_VDPA_SIM_NET is not set +CONFIG_VDPA_SIM_NET=m # CONFIG_VEML6030 is not set # CONFIG_VEML6070 is not set CONFIG_VETH=m |