summaryrefslogtreecommitdiffstats
path: root/drivers/Makefile
diff options
context:
space:
mode:
authorMaarten Lankhorst <maarten.lankhorst@canonical.com>2014-07-01 12:57:08 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-07-08 19:51:06 +0200
commit35fac7e305dc5e0bd1e52f2505944674337de57c (patch)
treec29dd4051f7d557bc812cf459108412c7174974a /drivers/Makefile
parentMerge branch 'component-for-driver' of git://ftp.arm.linux.org.uk/~rmk/linux-... (diff)
downloadlinux-35fac7e305dc5e0bd1e52f2505944674337de57c.tar.xz
linux-35fac7e305dc5e0bd1e52f2505944674337de57c.zip
dma-buf: move to drivers/dma-buf
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com> Acked-by: Sumit Semwal <sumit.semwal@linaro.org> Acked-by: Daniel Vetter <daniel@ffwll.ch> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/Makefile')
-rw-r--r--drivers/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/Makefile b/drivers/Makefile
index f98b50d8251d..c00337be5351 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -61,6 +61,7 @@ obj-$(CONFIG_FB_INTEL) += video/fbdev/intelfb/
obj-$(CONFIG_PARPORT) += parport/
obj-y += base/ block/ misc/ mfd/ nfc/
+obj-$(CONFIG_DMA_SHARED_BUFFER) += dma-buf/
obj-$(CONFIG_NUBUS) += nubus/
obj-y += macintosh/
obj-$(CONFIG_IDE) += ide/