diff --git a/[refs] b/[refs]
index ec29fc314b7c..603d9beb4fad 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 063c13a5adbd0ab3110cbefcf9ba5aeb103a84ac
+refs/heads/master: a35bee8a2748abe9a40865f477aba0a9b85965fd
diff --git a/trunk/arch/mips/Kconfig b/trunk/arch/mips/Kconfig
index 3ad59dde4852..2d3cf3890904 100644
--- a/trunk/arch/mips/Kconfig
+++ b/trunk/arch/mips/Kconfig
@@ -880,11 +880,15 @@ config NO_IOPORT
 config GENERIC_ISA_DMA
 	bool
 	select ZONE_DMA if GENERIC_ISA_DMA_SUPPORT_BROKEN=n
+	select ISA_DMA_API
 
 config GENERIC_ISA_DMA_SUPPORT_BROKEN
 	bool
 	select GENERIC_ISA_DMA
 
+config ISA_DMA_API
+	bool
+
 config GENERIC_GPIO
 	bool