diff --git a/[refs] b/[refs] index 43bf6e20a03d..d9935ee6c36f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9f9ff20d46c6728b092f34b6a642e1e81ab5e254 +refs/heads/master: d3f3cf859db17cc5f8156c5bfcd032413e44483b diff --git a/trunk/include/linux/dmaengine.h b/trunk/include/linux/dmaengine.h index c61d4ca27bcc..e2106495cc11 100644 --- a/trunk/include/linux/dmaengine.h +++ b/trunk/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; }