diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-07-19 15:37:55 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-07-19 15:37:55 +0200 |
| commit | 145a17d9e047c263b718cbe4bc243d0ee1ecf466 (patch) | |
| tree | 5a9e88daef4e9cb5c7266a67969ee0e7141b8ac7 /kernel-x86_64-fedora.config | |
| parent | 005c641a033a96ffc25e32fd4e39001248776fc1 (diff) | |
| parent | 5f0e0f3c714a197de8d36ab1c984fc722e87c60d (diff) | |
| download | kernel-145a17d9e047c263b718cbe4bc243d0ee1ecf466.tar.gz kernel-145a17d9e047c263b718cbe4bc243d0ee1ecf466.tar.xz kernel-145a17d9e047c263b718cbe4bc243d0ee1ecf466.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.14.0-0.rc2.23.vanilla.1.fc35kernel-5.14.0-0.rc2.23.vanilla.1.fc34kernel-5.14.0-0.rc2.23.vanilla.1.fc33
Diffstat (limited to 'kernel-x86_64-fedora.config')
| -rw-r--r-- | kernel-x86_64-fedora.config | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 5d81c9d3d..6a55b16a9 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -939,7 +939,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 @@ -1451,7 +1450,7 @@ CONFIG_DRM_GMA500=m # CONFIG_DRM_GMA600 is not set CONFIG_DRM_GUD=m # CONFIG_DRM_HISI_HIBMC is not set -# CONFIG_DRM_HYPERV is not set +CONFIG_DRM_HYPERV=m # CONFIG_DRM_I2C_ADV7511 is not set CONFIG_DRM_I2C_ADV7533=y CONFIG_DRM_I2C_CH7006=m @@ -2599,7 +2598,7 @@ CONFIG_INFINIBAND_SRPT=m CONFIG_INFINIBAND_USER_ACCESS=m CONFIG_INFINIBAND_USER_MAD=m CONFIG_INFINIBAND_USNIC=m -CONFIG_INFINIBAND_VMWARE_PVRDMA=m +# CONFIG_INFINIBAND_VMWARE_PVRDMA is not set # CONFIG_INFTL is not set # CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set @@ -3922,6 +3921,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=m CONFIG_ND_BTT=m # CONFIG_NDC_DIS_DYNAMIC_CACHING is not set |