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-aarch64-debug-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-aarch64-debug-fedora.config')
-rw-r--r-- | kernel-aarch64-debug-fedora.config | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 789e94096..99cae1350 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -1721,7 +1721,6 @@ CONFIG_DRM_HDLCD=m # CONFIG_DRM_HDLCD_SHOW_UNDERRUN is not set # CONFIG_DRM_HISI_HIBMC is not set CONFIG_DRM_HISI_KIRIN=m -# CONFIG_DRM_HYPERV is not set CONFIG_DRM_I2C_ADV7511_AUDIO=y CONFIG_DRM_I2C_ADV7511_CEC=y CONFIG_DRM_I2C_ADV7511=m @@ -3959,7 +3958,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 @@ -4304,6 +4302,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 |