diff --git a/[refs] b/[refs]
index 57d5b0053408..653148aba2b2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2704afebecc8e268e8c873b6dfab2077d679b593
+refs/heads/master: 8313da304cdb32465064202814996a2ca33f04e7
diff --git a/trunk/arch/mips/Kconfig b/trunk/arch/mips/Kconfig
index 65959280e091..3334a06e5973 100644
--- a/trunk/arch/mips/Kconfig
+++ b/trunk/arch/mips/Kconfig
@@ -692,10 +692,6 @@ config EARLY_PRINTK
 config SYS_HAS_EARLY_PRINTK
 	bool
 
-config GENERIC_ISA_DMA
-	bool
-	select ZONE_DMA
-
 config HOTPLUG_CPU
 	bool
 	default n
@@ -715,9 +711,13 @@ config MIPS_DISABLE_OBSOLETE_IDE
 config NO_IOPORT
 	def_bool n
 
+config GENERIC_ISA_DMA
+	bool
+	select ZONE_DMA if GENERIC_ISA_DMA_SUPPORT_BROKEN=n
+
 config GENERIC_ISA_DMA_SUPPORT_BROKEN
 	bool
-	select ZONE_DMA
+	select GENERIC_ISA_DMA
 
 config GENERIC_GPIO
 	bool