---
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -1033,9 +1033,6 @@ config FW_ARC
+@@ -1035,9 +1035,6 @@ config FW_ARC
config ARCH_MAY_HAVE_PC_FDC
bool
config CEVT_BCM1480
bool
-@@ -3090,6 +3087,18 @@ choice
+@@ -3092,6 +3089,18 @@ choice
bool "Extend builtin kernel arguments with bootloader arguments"
endchoice