From 484dcc3295aa92a3ab38803fe446a047a8976de6 Mon Sep 17 00:00:00 2001 From: YAMANE Toshiaki Date: Wed, 14 Nov 2012 19:40:14 +0900 Subject: [PATCH] --- yaml --- r: 337967 b: refs/heads/master c: 11d3d27b69207348a8552ec4139a2c461905e2b2 h: refs/heads/master i: 337965: 5cbd38c53ff8df2e11443aaa204049db31e4adef 337963: 45365a20365c57bb51655d30cd326717ea6464ec 337959: 8f9e35944aa1a6757f5be8bb325752d1de63d883 337951: 48c57ffeb35253bcbbd7dd41aab367b382aeb772 v: v3 --- [refs] | 2 +- trunk/drivers/staging/omapdrm/omap_gem_dmabuf.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 99599ea8413b..dcc5001bc2ef 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 696e3ca30aedcb11726050504b8e3c56bdc8285b +refs/heads/master: 11d3d27b69207348a8552ec4139a2c461905e2b2 diff --git a/trunk/drivers/staging/omapdrm/omap_gem_dmabuf.c b/trunk/drivers/staging/omapdrm/omap_gem_dmabuf.c index c6f3ef6f57b9..9a302062b031 100644 --- a/trunk/drivers/staging/omapdrm/omap_gem_dmabuf.c +++ b/trunk/drivers/staging/omapdrm/omap_gem_dmabuf.c @@ -191,13 +191,13 @@ struct dma_buf_ops omap_dmabuf_ops = { .mmap = omap_gem_dmabuf_mmap, }; -struct dma_buf * omap_gem_prime_export(struct drm_device *dev, +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, 0600); } -struct drm_gem_object * omap_gem_prime_import(struct drm_device *dev, +struct drm_gem_object *omap_gem_prime_import(struct drm_device *dev, struct dma_buf *buffer) { struct drm_gem_object *obj;