diff --git a/[refs] b/[refs]
index fa1580ccbad5..9c69add96c5c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b63e804459b9b550c1ab21a43e6bac2272e32612
+refs/heads/master: d388d6853f1b584b8606cb3f2f9f9e4fa2e52258
diff --git a/trunk/arch/mips/Kconfig b/trunk/arch/mips/Kconfig
index 734b61f663b7..7080e7117f41 100644
--- a/trunk/arch/mips/Kconfig
+++ b/trunk/arch/mips/Kconfig
@@ -63,6 +63,7 @@ config MACH_DECSTATION
 	bool "DECstations"
 	select BOOT_ELF32
 	select DMA_NONCOHERENT
+	select NO_IOPORT
 	select SYS_HAS_EARLY_PRINTK
 	select IRQ_CPU
 	select SYS_HAS_CPU_R3000
@@ -775,6 +776,9 @@ config MIPS_NILE4
 config MIPS_DISABLE_OBSOLETE_IDE
 	bool
 
+config NO_IOPORT
+	def_bool n
+
 config GENERIC_ISA_DMA_SUPPORT_BROKEN
 	bool
 	select ZONE_DMA