summaryrefslogtreecommitdiffstats
path: root/kernel-armv7hl-lpae-debug-fedora.config
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2021-07-19 15:37:55 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2021-07-19 15:37:55 +0200
commit145a17d9e047c263b718cbe4bc243d0ee1ecf466 (patch)
tree5a9e88daef4e9cb5c7266a67969ee0e7141b8ac7 /kernel-armv7hl-lpae-debug-fedora.config
parent005c641a033a96ffc25e32fd4e39001248776fc1 (diff)
parent5f0e0f3c714a197de8d36ab1c984fc722e87c60d (diff)
downloadkernel-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-armv7hl-lpae-debug-fedora.config')
-rw-r--r--kernel-armv7hl-lpae-debug-fedora.config4
1 files changed, 1 insertions, 3 deletions
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index 34fa84009..59b6deba4 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -1123,7 +1123,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_MAX77686=y
# CONFIG_COMMON_CLK_MAX9485 is not set
CONFIG_COMMON_CLK_MESON8B=y
@@ -1706,7 +1705,6 @@ CONFIG_DRM_GUD=m
CONFIG_DRM_HDLCD=m
# CONFIG_DRM_HDLCD_SHOW_UNDERRUN is not set
# CONFIG_DRM_HISI_HIBMC is not set
-# CONFIG_DRM_HYPERV is not set
CONFIG_DRM_I2C_ADV7511_AUDIO=y
CONFIG_DRM_I2C_ADV7511_CEC=y
CONFIG_DRM_I2C_ADV7511=m
@@ -3937,7 +3935,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
@@ -4279,6 +4276,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