diff --git a/[refs] b/[refs]
index f66403d1a119..92b8bb6dd326 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 10f9f9c8570f3656243d2585cbd818ac16dff4f3
+refs/heads/master: 5062969d77fed23b8ffc1a4124e96e991adaf52c
diff --git a/trunk/arch/cris/Kconfig b/trunk/arch/cris/Kconfig
index 0e9926d71a31..dfddd33c9213 100644
--- a/trunk/arch/cris/Kconfig
+++ b/trunk/arch/cris/Kconfig
@@ -47,9 +47,6 @@ config GENERIC_CALIBRATE_DELAY
 config NO_IOPORT
 	def_bool y
 
-config NO_IOMEM
-	def_bool y
-
 config FORCE_MAX_ZONEORDER
 	int
 	default 6