---

yaml --- r: 217505 b: refs/heads/master c: d911202 h: refs/heads/master i: 217503: 06c4414 v: v3
git-mirror · Oct 26, 2010 · ae93639 · ae93639
1 parent c2e076f
commit ae93639
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 114 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 98c532ecbe582586e204688c6cde7e27580cc43f
+refs/heads/master: d911202e3f722c29065942400ea108b7096bdac7
diff --git a/trunk/arch/um/Kconfig.um b/trunk/arch/um/Kconfig.um
@@ -147,3 +147,6 @@ config KERNEL_STACK_ORDER
 	  This option determines the size of UML kernel stacks.  They will
 	  be 1 << order pages.  The default is OK unless you're running Valgrind
 	  on UML, in which case, set this to 3.
+
+config NO_DMA
+	def_bool y
diff --git a/trunk/arch/um/defconfig b/trunk/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

diff --git a/trunk/arch/um/include/asm/dma-mapping.h b/trunk/arch/um/include/asm/dma-mapping.h