diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-08 17:05:09 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-08 17:05:09 -0500 |
| commit | 8e369672af8700299ab372bad9397f230b1d591a (patch) | |
| tree | 8676cfdb7f8c1ac5ee124aef050d541d70f876d0 /drivers/base/Makefile | |
| parent | 6950d76c531671ec389e36183311826597951ac6 (diff) | |
| parent | a125a3945c950caef001f22055bf201a36568533 (diff) | |
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/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/base/Makefile b/drivers/base/Makefile index 1334d893b56..2c8272dd93c 100644 --- a/drivers/base/Makefile +++ b/drivers/base/Makefile | |||
| @@ -9,6 +9,7 @@ obj-$(CONFIG_DEVTMPFS) += devtmpfs.o | |||
| 9 | obj-y += power/ | 9 | obj-y += power/ |
| 10 | obj-$(CONFIG_HAS_DMA) += dma-mapping.o | 10 | obj-$(CONFIG_HAS_DMA) += dma-mapping.o |
| 11 | obj-$(CONFIG_HAVE_GENERIC_DMA_COHERENT) += dma-coherent.o | 11 | obj-$(CONFIG_HAVE_GENERIC_DMA_COHERENT) += dma-coherent.o |
| 12 | obj-$(CONFIG_DMA_SHARED_BUFFER) += dma-buf.o | ||
| 12 | obj-$(CONFIG_ISA) += isa.o | 13 | obj-$(CONFIG_ISA) += isa.o |
| 13 | obj-$(CONFIG_FW_LOADER) += firmware_class.o | 14 | obj-$(CONFIG_FW_LOADER) += firmware_class.o |
| 14 | obj-$(CONFIG_NUMA) += node.o | 15 | obj-$(CONFIG_NUMA) += node.o |