summaryrefslogtreecommitdiffstats
path: root/kernel-s390x-fedora.config
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2021-07-19 08:26:09 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2021-07-19 08:26:09 -0500
commit5f0e0f3c714a197de8d36ab1c984fc722e87c60d (patch)
treebc95ba8f0e88a233d29f614bc213f06daa7659da /kernel-s390x-fedora.config
parent7464e60427be7b6af8d65b8db72db1ef2bb28549 (diff)
downloadkernel-5f0e0f3c714a197de8d36ab1c984fc722e87c60d.tar.gz
kernel-5f0e0f3c714a197de8d36ab1c984fc722e87c60d.tar.xz
kernel-5f0e0f3c714a197de8d36ab1c984fc722e87c60d.zip
kernel-5.14.0-0.rc1.20210719git1d67c8d993ba.22
* Mon Jul 19 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.14.0-0.rc1.20210719git1d67c8d993ba.22] - Revert "scsi: smartpqi: add inspur advantech ids" (Herton R. Krzesinski) - redhat/configs: Enable stmmac NIC for x86_64 (Mark Salter) Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
Diffstat (limited to 'kernel-s390x-fedora.config')
-rw-r--r--kernel-s390x-fedora.config4
1 files changed, 1 insertions, 3 deletions
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index 2d008e360..b6cab9761 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -883,7 +883,6 @@ CONFIG_COMMON_CLK_AXI_CLKGEN=m
# CONFIG_COMMON_CLK_FIXED_MMIO is not set
# CONFIG_COMMON_CLK_FSL_FLEXSPI is not set
# CONFIG_COMMON_CLK_FSL_SAI is not set
-CONFIG_COMMON_CLK_HI3559A=y
# CONFIG_COMMON_CLK_MAX9485 is not set
# CONFIG_COMMON_CLK_MMP2_AUDIO is not set
# CONFIG_COMMON_CLK_PWM is not set
@@ -1341,7 +1340,6 @@ CONFIG_DRM_FBDEV_OVERALLOC=100
CONFIG_DRM_GM12U320=m
CONFIG_DRM_GUD=m
# CONFIG_DRM_HISI_HIBMC is not set
-# CONFIG_DRM_HYPERV is not set
# CONFIG_DRM_I2C_ADV7511 is not set
CONFIG_DRM_I2C_ADV7533=y
# CONFIG_DRM_I2C_CH7006 is not set
@@ -3314,7 +3312,6 @@ CONFIG_MICROCHIP_PHY=m
# CONFIG_MICROCHIP_PIT64B is not set
# CONFIG_MICROCHIP_T1_PHY is not set
CONFIG_MICROSEMI_PHY=m
-CONFIG_MICROSOFT_MANA=m
CONFIG_MIGRATION=y
CONFIG_MII=m
CONFIG_MINIX_FS=m
@@ -3595,6 +3592,7 @@ CONFIG_NATSEMI=m
# CONFIG_NAU7802 is not set
# CONFIG_NBPFAXI_DMA is not set
CONFIG_NCSI_OEM_CMD_GET_MAC=y
+CONFIG_NCSI_OEM_CMD_KEEP_PHY=y
# CONFIG_ND_BLK is not set
# CONFIG_NDC_DIS_DYNAMIC_CACHING is not set
CONFIG_NE2K_PCI=m