Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/tg3-2.6

[pandora-kernel.git] / arch / sparc / defconfig

diff --git a/arch/sparc/defconfig b/arch/sparc/defconfig
index 8a3aef1..a698562 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