diff --git a/[refs] b/[refs]
index a06ef71852f0..2232b33635f3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fd694a1ead63e0818d96ed3c94d91e9796d6390f
+refs/heads/master: 1a8fffff6737c0be0769ca273bb74a9337b549a6
diff --git a/trunk/arch/m32r/Kconfig b/trunk/arch/m32r/Kconfig
index b92b9445255d..0e0b312d90d2 100644
--- a/trunk/arch/m32r/Kconfig
+++ b/trunk/arch/m32r/Kconfig
@@ -322,13 +322,6 @@ config NODES_SHIFT
 	default "1"
 	depends on NEED_MULTIPLE_NODES
 
-# turning this on wastes a bunch of space.
-# Summit needs it only when NUMA is on
-config BOOT_IOREMAP
-	bool
-	depends on NUMA
-	default n
-
 endmenu