From cc2f94debf9efc0c4fd2a9f31f2adaecb3a9bb28 Mon Sep 17 00:00:00 2001 From: Frank Wunderlich Date: Wed, 10 Apr 2024 15:50:46 +0200 Subject: [PATCH] defconfig: r4: fix panic_timeout defined twice --- arch/arm64/configs/mt7988a_bpi-r4_defconfig | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/arm64/configs/mt7988a_bpi-r4_defconfig b/arch/arm64/configs/mt7988a_bpi-r4_defconfig index 8bce49b17dcb..278c41183093 100644 --- a/arch/arm64/configs/mt7988a_bpi-r4_defconfig +++ b/arch/arm64/configs/mt7988a_bpi-r4_defconfig @@ -399,7 +399,7 @@ CONFIG_PACKET=y CONFIG_PAGE_SIZE_4KB=y CONFIG_PANIC_ON_OOPS=y CONFIG_PANIC_ON_OOPS_VALUE=1 -CONFIG_PANIC_TIMEOUT=1 +CONFIG_PANIC_TIMEOUT=10 CONFIG_PARTITION_ADVANCED=y CONFIG_PCIE_BUS_DEFAULT=y CONFIG_PCI_QUIRKS=y @@ -1270,5 +1270,3 @@ CONFIG_PCS_MTK_USXGMII=y CONFIG_MT7915E=m CONFIG_MT798X_WMAC=y CONFIG_PHY_MTK_XFI_TPHY=y - -CONFIG_PANIC_TIMEOUT=30