diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-07-15 16:16:27 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-07-15 16:16:27 +1000 |
| commit | 693cfd6fa59d97d8446577b7bbc471f771153ec1 (patch) | |
| tree | 73591adea46376f7fc5cb5a057f36f3b1d820a3b /drivers/gpu/drm/omapdrm | |
| parent | 805c172f268897387f4d991536f5c57b5bf7f4eb (diff) | |
| parent | 954513551f5afb7893b7c688a67219356ab3efe6 (diff) | |
Merge remote-tracking branch 'driver-core/driver-core-next'
Diffstat (limited to 'drivers/gpu/drm/omapdrm')
| -rw-r--r-- | drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c b/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c index 4fcca8d42796..a2dbfb1737b4 100644 --- a/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c +++ b/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c @@ -171,7 +171,7 @@ static struct dma_buf_ops omap_dmabuf_ops = { struct dma_buf *omap_gem_prime_export(struct drm_device *dev, struct drm_gem_object *obj, int flags) { - return dma_buf_export(obj, &omap_dmabuf_ops, obj->size, flags); + return dma_buf_export(obj, &omap_dmabuf_ops, obj->size, flags, NULL); } struct drm_gem_object *omap_gem_prime_import(struct drm_device *dev, |