diff options
author | 2013-07-02 11:15:15 +0530 | |
---|---|---|
committer | 2013-07-02 10:08:22 +0200 | |
commit | f825c736e75b11adb59ec52a4a1096efddd2ec97 (patch) | |
tree | 0592b3e3cf216341da2daa072874be0fc7d284d9 /drivers/base/Makefile | |
parent | Linux 3.10 (diff) | |
download | linux-f825c736e75b11adb59ec52a4a1096efddd2ec97.tar.gz linux-f825c736e75b11adb59ec52a4a1096efddd2ec97.tar.bz2 linux-f825c736e75b11adb59ec52a4a1096efddd2ec97.zip |
mm/cma: Move dma contiguous changes into a seperate config
We want to use CMA for allocating hash page table and real mode area for
PPC64. Hence move DMA contiguous related changes into a seperate config
so that ppc64 can enable CMA without requiring DMA contiguous.
Acked-by: Michal Nazarewicz <mina86@mina86.com>
Acked-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
[removed defconfig changes]
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Diffstat (limited to 'drivers/base/Makefile')
-rw-r--r-- | drivers/base/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/Makefile b/drivers/base/Makefile index 4e22ce3ed73d..5d93bb519753 100644 --- a/drivers/base/Makefile +++ b/drivers/base/Makefile @@ -6,7 +6,7 @@ obj-y := core.o bus.o dd.o syscore.o \ attribute_container.o transport_class.o \ topology.o obj-$(CONFIG_DEVTMPFS) += devtmpfs.o -obj-$(CONFIG_CMA) += dma-contiguous.o +obj-$(CONFIG_DMA_CMA) += dma-contiguous.o obj-y += power/ obj-$(CONFIG_HAS_DMA) += dma-mapping.o obj-$(CONFIG_HAVE_GENERIC_DMA_COHERENT) += dma-coherent.o |