summaryrefslogtreecommitdiffstats
path: root/drivers/base/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-01-08 14:05:09 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-01-08 14:05:09 -0800
commit8e369672af8700299ab372bad9397f230b1d591a (patch)
tree8676cfdb7f8c1ac5ee124aef050d541d70f876d0 /drivers/base/Makefile
parent6950d76c531671ec389e36183311826597951ac6 (diff)
parenta125a3945c950caef001f22055bf201a36568533 (diff)
downloadlinux-8e369672af8700299ab372bad9397f230b1d591a.tar.bz2
Merge branch 'dma-buf-merge' of git://people.freedesktop.org/~airlied/linux
* 'dma-buf-merge' of git://people.freedesktop.org/~airlied/linux: dma-buf: mark EXPERIMENTAL for 1st release. dma-buf: Documentation for buffer sharing framework dma-buf: Introduce dma buffer sharing mechanism
Diffstat (limited to 'drivers/base/Makefile')
-rw-r--r--drivers/base/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/base/Makefile b/drivers/base/Makefile
index 1334d893b560..2c8272dd93c4 100644
--- a/drivers/base/Makefile
+++ b/drivers/base/Makefile
@@ -9,6 +9,7 @@ obj-$(CONFIG_DEVTMPFS) += devtmpfs.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_ISA) += isa.o
obj-$(CONFIG_FW_LOADER) += firmware_class.o
obj-$(CONFIG_NUMA) += node.o