--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -1113,7 +1113,6 @@ config DMA_PERDEV_COHERENT
+@@ -1116,7 +1116,6 @@ config DMA_PERDEV_COHERENT
config DMA_NONCOHERENT
bool
select ARCH_HAS_SYNC_DMA_FOR_DEVICE
select NEED_DMA_MAP_STATE
select DMA_NONCOHERENT_MMAP
select DMA_NONCOHERENT_CACHE_SYNC
-@@ -1894,9 +1893,11 @@ config SYS_HAS_CPU_MIPS32_R3_5
+@@ -1897,9 +1896,11 @@ config SYS_HAS_CPU_MIPS32_R3_5
config SYS_HAS_CPU_MIPS32_R5
bool
config SYS_HAS_CPU_MIPS64_R1
bool
-@@ -1906,6 +1907,7 @@ config SYS_HAS_CPU_MIPS64_R2
+@@ -1909,6 +1910,7 @@ config SYS_HAS_CPU_MIPS64_R2
config SYS_HAS_CPU_MIPS64_R6
bool
config SYS_HAS_CPU_R3000
bool
-@@ -1942,6 +1944,7 @@ config SYS_HAS_CPU_R8000
+@@ -1945,6 +1947,7 @@ config SYS_HAS_CPU_R8000
config SYS_HAS_CPU_R10000
bool
config SYS_HAS_CPU_RM7000
bool
-@@ -1970,6 +1973,7 @@ config SYS_HAS_CPU_BMIPS4380
+@@ -1973,6 +1976,7 @@ config SYS_HAS_CPU_BMIPS4380
config SYS_HAS_CPU_BMIPS5000
bool
select SYS_HAS_CPU_BMIPS