---
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -802,9 +802,6 @@ config ARC
+@@ -806,9 +806,6 @@ config ARC
config ARCH_MAY_HAVE_PC_FDC
bool
config CEVT_BCM1480
bool
-@@ -2240,6 +2237,18 @@ config USE_OF
+@@ -2244,6 +2241,18 @@ config USE_OF
help
Include support for flattened device tree machine descriptions.