---
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -877,9 +877,6 @@ config ARC
+@@ -894,9 +894,6 @@ config ARC
config ARCH_MAY_HAVE_PC_FDC
bool
config CEVT_BCM1480
bool
-@@ -2330,6 +2327,18 @@ config USE_OF
+@@ -2367,6 +2364,18 @@ config USE_OF
help
Include support for flattened device tree machine descriptions.