diff --git a/[refs] b/[refs]
index bae72b3a98ea..1a318055fde8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 63dc02bde6af1e41d28ebc3774c5f094f362e8c3
+refs/heads/master: c30b9c432ebb8951aa20fe825b5b8f1651628e3c
diff --git a/trunk/arch/sh/Kconfig b/trunk/arch/sh/Kconfig
index 182384d5d1e0..536e058fe8a2 100644
--- a/trunk/arch/sh/Kconfig
+++ b/trunk/arch/sh/Kconfig
@@ -157,7 +157,8 @@ config ARCH_HAS_CPU_IDLE_WAIT
 
 config NO_IOPORT
 	def_bool !PCI
-	depends on !SH_CAYMAN && !SH_SH4202_MICRODEV && !SH_SHMIN
+	depends on !SH_CAYMAN && !SH_SH4202_MICRODEV && !SH_SHMIN && \
+		   !SH_HP6XX && !SH_SOLUTION_ENGINE
 
 config IO_TRAPPED
 	bool