aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathieu Lacage <mathieu.lacage@sophia.inria.fr>2010-08-14 15:02:44 +0200
committerDan Williams <dan.j.williams@intel.com>2010-09-22 15:29:32 -0700
commitd3f3cf859db17cc5f8156c5bfcd032413e44483b (patch)
tree2220abc850360b76103530724f0b7da91b1dd8fa
parent9f9ff20d46c6728b092f34b6a642e1e81ab5e254 (diff)
downloadmrst-s0i3-test-d3f3cf859db17cc5f8156c5bfcd032413e44483b.tar.gz
mrst-s0i3-test-d3f3cf859db17cc5f8156c5bfcd032413e44483b.tar.xz
mrst-s0i3-test-d3f3cf859db17cc5f8156c5bfcd032413e44483b.zip
missing inline keyword for static function in linux/dmaengine.h
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>
-rw-r--r--include/linux/dmaengine.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
index c61d4ca27bc..e2106495cc1 100644
--- 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;
}