OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9f9ff20
)
missing inline keyword for static function in linux/dmaengine.h
author
Mathieu Lacage
<mathieu.lacage@sophia.inria.fr>
Sat, 14 Aug 2010 13:02:44 +0000
(15:02 +0200)
committer
Dan Williams
<dan.j.williams@intel.com>
Wed, 22 Sep 2010 22:29:32 +0000
(15:29 -0700)
Add a missing inline keyword for static function in linux/dmaengine.h to
avoid duplicate symbol definitions.
Signed-off-by: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
include/linux/dmaengine.h
patch
|
blob
|
history
diff --git
a/include/linux/dmaengine.h
b/include/linux/dmaengine.h
index
c61d4ca
..
e210649
100644
(file)
--- a/
include/linux/dmaengine.h
+++ b/
include/linux/dmaengine.h
@@
-548,7
+548,7
@@
static inline bool dma_dev_has_pq_continue(struct dma_device *dma)
return (dma->max_pq & DMA_HAS_PQ_CONTINUE) == DMA_HAS_PQ_CONTINUE;
}
-static unsigned short dma_dev_to_maxpq(struct dma_device *dma)
+static
inline
unsigned short dma_dev_to_maxpq(struct dma_device *dma)
{
return dma->max_pq & ~DMA_HAS_PQ_CONTINUE;
}