diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-02-18 00:42:45 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-02-18 00:42:45 +0400 |
| commit | 60f76eab19e3903e810bdc3ec846c158efcd2e21 (patch) | |
| tree | a828bba28e349c63b01aa586f27f7ec63e7b71ba /include | |
| parent | 2b250395c256837034dd509fb336f9d30bea0cb9 (diff) | |
| parent | c0b00a525c127d0055c1df6283300e17f601a1a1 (diff) | |
| download | linux-60f76eab19e3903e810bdc3ec846c158efcd2e21.tar.xz | |
Merge tag 'dma-buf-for-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/sumits/dma-buf
Pull dma-buf fix from Sumit Semwal:
"Just some debugfs output updates.
There's another patch related to dma-buf, but it'll get upstreamed via
Greg KH's pull request"
* tag 'dma-buf-for-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/sumits/dma-buf:
dma-buf: update debugfs output
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/dma-buf.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h index dfac5ed31120..f886985a28b2 100644 --- a/include/linux/dma-buf.h +++ b/include/linux/dma-buf.h @@ -171,7 +171,7 @@ struct dma_buf *dma_buf_export_named(void *priv, const struct dma_buf_ops *ops, size_t size, int flags, const char *); #define dma_buf_export(priv, ops, size, flags) \ - dma_buf_export_named(priv, ops, size, flags, __FILE__) + dma_buf_export_named(priv, ops, size, flags, KBUILD_MODNAME) int dma_buf_fd(struct dma_buf *dmabuf, int flags); struct dma_buf *dma_buf_get(int fd); |