diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-05-18 20:03:53 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-05-18 20:03:53 +0400 |
| commit | fe9bbf433976daffe728d14a1a31b49d8ff06f40 (patch) | |
| tree | 076ab7dcac96083681d052b63e035d39da527c62 | |
| parent | 831b808c4d275a9640b4663e02843d4191a7efd9 (diff) | |
Fix videobuf2-core.c compilation error when CONFIG_DMA_SHARED_BUFFER=ntracking-last-minute-fixes-3.4-2012.05-0
The error has been introduced by commit 4d33ccbffa60bbc6cf7b143b2ce4226bd553968c
"dma-buf: add vmap interface", which definitely was not tested for the
CONFIG_DMA_SHARED_BUFFER=n case.
Signed-off-by: Andrey Konovalov <andrey.konovalov@linaro.org>
| -rw-r--r-- | include/linux/dma-buf.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h index 8fe719fbb281..9600f8169869 100644 --- a/include/linux/dma-buf.h +++ b/include/linux/dma-buf.h @@ -271,9 +271,10 @@ static inline int dma_buf_mmap(struct dma_buf *dmabuf, static inline void *dma_buf_vmap(struct dma_buf *dmabuf) { + return NULL; } -static inline void dma_buf_vunmap(struct dma_buf *dmabuf, void *vaddr); +static inline void dma_buf_vunmap(struct dma_buf *dmabuf, void *vaddr) { } #endif /* CONFIG_DMA_SHARED_BUFFER */ |