aboutsummaryrefslogtreecommitdiff
path: root/drivers/dma-buf/fence.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-08-28 10:30:25 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-08-28 10:30:25 -0700
commitdaf543b177835e42a806439346d367dafeb3a1d3 (patch)
tree66d14e77194681abaa6ae9ec36fa2ea86f547885 /drivers/dma-buf/fence.c
parent521bd5e4d9e6eb7e3c76c615d650a2b5ad0f03f5 (diff)
parent1f58d9465c568eb47cab939bbc4f30ae51863295 (diff)
downloadlinux-stericsson-daf543b177835e42a806439346d367dafeb3a1d3.tar.gz
Merge tag 'for-3.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/sumits/dma-buf
Pull dma-buf fixes from Sumit Semwal: "The major changes for 3.17 already went via Greg-KH's tree this time as well; this is a small pull request for dma-buf - all documentation related" * tag 'for-3.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/sumits/dma-buf: dma-buf/fence: Fix one more kerneldoc warning dma-buf/fence: Fix a kerneldoc warning Documentation/dma-buf-sharing.txt: update API descriptions
Diffstat (limited to 'drivers/dma-buf/fence.c')
-rw-r--r--drivers/dma-buf/fence.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma-buf/fence.c b/drivers/dma-buf/fence.c
index 4222cb2aa96a..7bb9d65d9a2c 100644
--- a/drivers/dma-buf/fence.c
+++ b/drivers/dma-buf/fence.c
@@ -29,7 +29,7 @@
EXPORT_TRACEPOINT_SYMBOL(fence_annotate_wait_on);
EXPORT_TRACEPOINT_SYMBOL(fence_emit);
-/**
+/*
* fence context counter: each execution context should have its own
* fence context, this allows checking if fences belong to the same
* context or not. One device can have multiple separate contexts,