---
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -1067,9 +1067,6 @@ config FW_ARC
+@@ -1068,9 +1068,6 @@ config FW_ARC
config ARCH_MAY_HAVE_PC_FDC
bool
config CEVT_BCM1480
bool
-@@ -3041,6 +3038,18 @@ choice
+@@ -3042,6 +3039,18 @@ choice
bool "Extend builtin kernel arguments with bootloader arguments"
endchoice