diff options
| -rw-r--r-- | arch/s390/Kconfig | 3 | ||||
| -rw-r--r-- | drivers/base/Makefile | 4 | ||||
| -rw-r--r-- | include/asm-s390/dma-mapping.h | 2 | ||||
| -rw-r--r-- | lib/Kconfig | 5 |
4 files changed, 10 insertions, 4 deletions
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index e6ec418093e..1a84719be26 100644 --- a/arch/s390/Kconfig +++ b/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/drivers/base/Makefile b/drivers/base/Makefile index e9eb7382ac3..b39ea3f59c9 100644 --- a/drivers/base/Makefile +++ b/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/include/asm-s390/dma-mapping.h b/include/asm-s390/dma-mapping.h index 09bb7b04f96..3f8c12fde0f 100644 --- a/include/asm-s390/dma-mapping.h +++ b/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/lib/Kconfig b/lib/Kconfig index 38424991504..96d6e8ca8b7 100644 --- a/lib/Kconfig +++ b/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 |