Commit 35fac7e3 authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Greg Kroah-Hartman
parent 650f81d4
...@@ -128,8 +128,7 @@ X!Edrivers/base/interface.c ...@@ -128,8 +128,7 @@ X!Edrivers/base/interface.c
!Edrivers/base/bus.c !Edrivers/base/bus.c
</sect1> </sect1>
<sect1><title>Device Drivers DMA Management</title> <sect1><title>Device Drivers DMA Management</title>
!Edrivers/base/dma-buf.c !Edrivers/dma-buf/dma-buf.c
!Edrivers/base/reservation.c
!Iinclude/linux/reservation.h !Iinclude/linux/reservation.h
!Edrivers/base/dma-coherent.c !Edrivers/base/dma-coherent.c
!Edrivers/base/dma-mapping.c !Edrivers/base/dma-mapping.c
......
...@@ -2900,8 +2900,8 @@ S: Maintained ...@@ -2900,8 +2900,8 @@ S: Maintained
L: linux-media@vger.kernel.org L: linux-media@vger.kernel.org
L: dri-devel@lists.freedesktop.org L: dri-devel@lists.freedesktop.org
L: linaro-mm-sig@lists.linaro.org L: linaro-mm-sig@lists.linaro.org
F: drivers/base/dma-buf* F: drivers/dma-buf/
F: include/linux/dma-buf* F: include/linux/dma-buf* include/linux/reservation.h
F: Documentation/dma-buf-sharing.txt F: Documentation/dma-buf-sharing.txt
T: git git://git.linaro.org/people/sumitsemwal/linux-dma-buf.git T: git git://git.linaro.org/people/sumitsemwal/linux-dma-buf.git
......
...@@ -61,6 +61,7 @@ obj-$(CONFIG_FB_INTEL) += video/fbdev/intelfb/ ...@@ -61,6 +61,7 @@ obj-$(CONFIG_FB_INTEL) += video/fbdev/intelfb/
obj-$(CONFIG_PARPORT) += parport/ obj-$(CONFIG_PARPORT) += parport/
obj-y += base/ block/ misc/ mfd/ nfc/ obj-y += base/ block/ misc/ mfd/ nfc/
obj-$(CONFIG_DMA_SHARED_BUFFER) += dma-buf/
obj-$(CONFIG_NUBUS) += nubus/ obj-$(CONFIG_NUBUS) += nubus/
obj-y += macintosh/ obj-y += macintosh/
obj-$(CONFIG_IDE) += ide/ obj-$(CONFIG_IDE) += ide/
......
...@@ -10,7 +10,6 @@ obj-$(CONFIG_DMA_CMA) += dma-contiguous.o ...@@ -10,7 +10,6 @@ obj-$(CONFIG_DMA_CMA) += dma-contiguous.o
obj-y += power/ obj-y += power/
obj-$(CONFIG_HAS_DMA) += dma-mapping.o obj-$(CONFIG_HAS_DMA) += dma-mapping.o
obj-$(CONFIG_HAVE_GENERIC_DMA_COHERENT) += dma-coherent.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_ISA) += isa.o
obj-$(CONFIG_FW_LOADER) += firmware_class.o obj-$(CONFIG_FW_LOADER) += firmware_class.o
obj-$(CONFIG_NUMA) += node.o obj-$(CONFIG_NUMA) += node.o
......
obj-y := dma-buf.o reservation.o
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment