Merge tag 'nfs-for-3.6-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[deliverable/linux.git] / drivers / base / dma-coherent.c

diff --git a/drivers/base/dma-coherent.c b/drivers/base/dma-coherent.c
index 1b85949e3d2f3f562ea18c61e890309fe18601af..560a7173f810015a9532d25395a8ad1a57366e6c 100644 (file)
--- a/drivers/base/dma-coherent.c
+++ b/drivers/base/dma-coherent.c
@@ -186,6 +186,7 @@ EXPORT_SYMBOL(dma_release_from_coherent);
  * @vma:       vm_area for the userspace memory
  * @vaddr:     cpu address returned by dma_alloc_from_coherent
  * @size:      size of the memory buffer allocated by dma_alloc_from_coherent
+ * @ret:       result from remap_pfn_range()
  *
  * This checks whether the memory was allocated from the per-device
  * coherent memory pool and if so, maps that memory to the provided vma.