diff --git a/[refs] b/[refs] index a10951758b2f..ea3cb0b8acd9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: deef12443785add808af39ff7f836b54bc5c4253 +refs/heads/master: d18d5f59797009d86a0ee46feb2a56d53707455a diff --git a/trunk/include/linux/dmaengine.h b/trunk/include/linux/dmaengine.h index 8cd0e2556d04..c88f302d91c9 100644 --- a/trunk/include/linux/dmaengine.h +++ b/trunk/include/linux/dmaengine.h @@ -992,7 +992,7 @@ static inline struct dma_chan *__dma_request_channel(dma_cap_mask_t *mask, static inline struct dma_chan *dma_request_slave_channel(struct device *dev, char *name) { - return NULL + return NULL; } static inline void dma_release_channel(struct dma_chan *chan) {