Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35fac7e3 authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Greg Kroah-Hartman
Browse files

dma-buf: move to drivers/dma-buf 



Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@canonical.com>
Acked-by: default avatarSumit Semwal <sumit.semwal@linaro.org>
Acked-by: default avatarDaniel Vetter <daniel@ffwll.ch>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 650f81d4

Documentation/DocBook/device-drivers.tmpl

+1 −2
Original line number Diff line number Diff line
@@ -128,8 +128,7 @@ X!Edrivers/base/interface.c 
!Edrivers/base/bus.c

     </sect1>

     <sect1><title>Device Drivers DMA Management</title>

!Edrivers/base/dma-buf.c

!Edrivers/base/reservation.c

!Edrivers/dma-buf/dma-buf.c

!Iinclude/linux/reservation.h

!Edrivers/base/dma-coherent.c

!Edrivers/base/dma-mapping.c

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -2900,8 +2900,8 @@ S: Maintained 
L:	linux-media@vger.kernel.org

L:	dri-devel@lists.freedesktop.org

L:	linaro-mm-sig@lists.linaro.org

F:	drivers/base/dma-buf*

F:	include/linux/dma-buf*

F:	drivers/dma-buf/

F:	include/linux/dma-buf* include/linux/reservation.h

F:	Documentation/dma-buf-sharing.txt

T:	git git://git.linaro.org/people/sumitsemwal/linux-dma-buf.git

drivers/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -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/

drivers/base/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 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 reservation.o

obj-$(CONFIG_ISA)	+= isa.o

obj-$(CONFIG_FW_LOADER)	+= firmware_class.o

obj-$(CONFIG_NUMA)	+= node.o

drivers/dma-buf/Makefile

0 → 100644
+1 −0
Original line number Diff line number Diff line 
obj-y := dma-buf.o reservation.o