Merge remote-tracking branch 'origin/next' into kvm-ppc-next

[mirror_ubuntu-bionic-kernel.git] / drivers / base / Makefile

diff --git a/drivers/base/Makefile b/drivers/base/Makefile
index 48029aa477d94b1c6b01fe90b367a9e77e2e5dfe..94e8a80e87f87e545638f257ead04c56f73f088b 100644 (file)
--- 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