diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-05-21 20:18:54 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-05-21 20:18:54 +0400 |
| commit | 10bc69714f9fb1a978d91466c9f069258e2b210d (patch) | |
| tree | c3cf84ba7e94850cac2f21f664cb6aaabc6c521c | |
| parent | b82a2dd2c99a9fe17980c03c3937d4a93d393346 (diff) | |
| parent | fe9bbf433976daffe728d14a1a31b49d8ff06f40 (diff) | |
Merge branch 'rebase-last-minute-fixes' into merge-linux-linarolinux-linaro-3.4-2012.05-0linux-linaro_3.4-2012.05-0
| -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 */ |