diff --git a/[refs] b/[refs]
index d0b6d909a76c..245f05267036 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2256c13b992b09f1f9563c26457aa048da2865df
+refs/heads/master: eb98129eec7fa605f0407dfd92d40ee8ddf5cd9a
diff --git a/trunk/arch/sparc/Kconfig b/trunk/arch/sparc/Kconfig
index 6537445dac0e..f7c51b869049 100644
--- a/trunk/arch/sparc/Kconfig
+++ b/trunk/arch/sparc/Kconfig
@@ -21,6 +21,10 @@ config GENERIC_ISA_DMA
 	bool
 	default y
 
+config GENERIC_IOMAP
+	bool
+	default y
+
 source "init/Kconfig"
 
 menu "General machine setup"
diff --git a/trunk/arch/sparc/defconfig b/trunk/arch/sparc/defconfig
index a69856263009..8a3aef1e22f5 100644
--- a/trunk/arch/sparc/defconfig
+++ b/trunk/arch/sparc/defconfig
@@ -5,6 +5,7 @@ CONFIG_MMU=y
 CONFIG_UID16=y
 CONFIG_HIGHMEM=y
 CONFIG_GENERIC_ISA_DMA=y
+CONFIG_GENERIC_IOMAP=y
 
 #
 # Code maturity level options