Merge remote-tracking branch 'dma-public/for-v3.12-cma-dma' into for-next

[linux-2.6-block.git] / drivers / base / Makefile

diff --git a/drivers/base/Makefile b/drivers/base/Makefile
index 5d93bb519753b5047750748f2d2e6ae56d9ebf5a..94e8a80e87f87e545638f257ead04c56f73f088b 100644 (file)
--- a/drivers/base/Makefile
+++ b/drivers/base/Makefile
@@ -10,7 +10,7 @@ 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
-obj-$(CONFIG_DMA_SHARED_BUFFER) += dma-buf.o
+obj-$(CONFIG_DMA_SHARED_BUFFER) += dma-buf.o reservation.o
 obj-$(CONFIG_ISA)      += isa.o
 obj-$(CONFIG_FW_LOADER)        += firmware_class.o
 obj-$(CONFIG_NUMA)     += node.o