Merge git://oss.sgi.com:8090/xfs-2.6

[linux-2.6] / arch / sparc / defconfig

diff --git a/arch/sparc/defconfig b/arch/sparc/defconfig
index 8a3aef1e22f511cb5aba08294fba2665a54d80b5..a69856263009fc63efaa74cde0730994fe689ace 100644 (file)
--- a/arch/sparc/defconfig
+++ b/arch/sparc/defconfig
@@ -5,7 +5,6 @@ CONFIG_MMU=y
 CONFIG_UID16=y
 CONFIG_HIGHMEM=y
 CONFIG_GENERIC_ISA_DMA=y
-CONFIG_GENERIC_IOMAP=y
 
 #
 # Code maturity level options