From 3ced5b850caddd12dd9962332e3c269ebf9e4d26 Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Sun, 6 May 2007 14:49:09 -0700 Subject: [PATCH] --- yaml --- r: 54178 b: refs/heads/master c: 411f0f3edc141a582190d3605cadd1d993abb6df h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/s390/Kconfig | 3 +++ trunk/drivers/base/Makefile | 4 ++-- trunk/include/asm-s390/dma-mapping.h | 2 -- trunk/lib/Kconfig | 5 +++++ 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index b947710c62ff..5ca293bb00bc 100644 --- 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 index e6ec418093e5..1a84719be264 100644 --- 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 index e9eb7382ac3a..b39ea3f59c9b 100644 --- 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 index 09bb7b04f967..3f8c12fde0f0 100644 --- 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 - #endif /* _ASM_DMA_MAPPING_H */ diff --git a/trunk/lib/Kconfig b/trunk/lib/Kconfig index 384249915047..96d6e8ca8b70 100644 --- 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