---

yaml --- r: 54178 b: refs/heads/master c: 411f0f3 h: refs/heads/master v: v3
git-mirror · May 7, 2007 · 3ced5b8 · 3ced5b8
1 parent eed27a0
commit 3ced5b8
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a82782f8f58219d0c6dc5f0211ce301adf6c6f4
+refs/heads/master: 411f0f3edc141a582190d3605cadd1d993abb6df
diff --git a/trunk/arch/s390/Kconfig b/trunk/arch/s390/Kconfig
@@ -49,6 +49,9 @@ config GENERIC_BUG
 config NO_IOMEM
 	def_bool y
 
+config NO_DMA
+	def_bool y
+
 mainmenu "Linux Kernel Configuration"
 
 config S390

diff --git a/trunk/drivers/base/Makefile b/trunk/drivers/base/Makefile
@@ -2,10 +2,10 @@
 
 obj-y			:= core.o sys.o bus.o dd.o \
 			   driver.o class.o platform.o \
-			   cpu.o firmware.o init.o map.o dmapool.o \
-			   dma-mapping.o devres.o \
+			   cpu.o firmware.o init.o map.o devres.o \
 			   attribute_container.o transport_class.o
 obj-y			+= power/
+obj-$(CONFIG_HAS_DMA)	+= dma-mapping.o dmapool.o
 obj-$(CONFIG_ISA)	+= isa.o
 obj-$(CONFIG_FW_LOADER)	+= firmware_class.o
 obj-$(CONFIG_NUMA)	+= node.o

diff --git a/trunk/include/asm-s390/dma-mapping.h b/trunk/include/asm-s390/dma-mapping.h
@@ -9,6 +9,4 @@
 #ifndef _ASM_DMA_MAPPING_H
 #define _ASM_DMA_MAPPING_H
 
-#include <asm-generic/dma-mapping-broken.h>
-
 #endif /* _ASM_DMA_MAPPING_H */
diff --git a/trunk/lib/Kconfig b/trunk/lib/Kconfig
@@ -111,4 +111,9 @@ config HAS_IOPORT
 	depends on HAS_IOMEM && !NO_IOPORT
 	default y
 
+config HAS_DMA
+	boolean
+	depends on !NO_DMA
+	default y
+
 endmenu