projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'drm-for-v4.9' of git://people.freedesktop.org/~airlied/linux
[linux-2.6-block.git]
/
drivers
/
gpu
/
drm
/
armada
/
armada_gem.c
diff --git
a/drivers/gpu/drm/armada/armada_gem.c
b/drivers/gpu/drm/armada/armada_gem.c
index ff843160c60099ff610076939f6abe1f285066e3..8067918973046a14441ecef699f5b3337f17ecbf 100644
(file)
--- a/
drivers/gpu/drm/armada/armada_gem.c
+++ b/
drivers/gpu/drm/armada/armada_gem.c
@@
-547,7
+547,7
@@
armada_gem_prime_export(struct drm_device *dev, struct drm_gem_object *obj,
exp_info.flags = O_RDWR;
exp_info.priv = obj;
- return d
ma_buf_export(
&exp_info);
+ return d
rm_gem_dmabuf_export(dev,
&exp_info);
}
struct drm_gem_object *