Merge branch 'for-2.6.37' into HEAD

[cascardo/linux.git] / arch / um / defconfig

diff --git a/arch/um/defconfig b/arch/um/defconfig
index 6bd456f..564f3de 100644 (file)
--- a/arch/um/defconfig
+++ b/arch/um/defconfig
@@ -566,7 +566,6 @@ CONFIG_CRC32=m
 # CONFIG_CRC7 is not set
 # CONFIG_LIBCRC32C is not set
 CONFIG_PLIST=y
-CONFIG_HAS_DMA=y
 
 #
 # SCSI device support