Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 337967
b: refs/heads/master
c: 11d3d27
h: refs/heads/master
i:
  337965: 5cbd38c
  337963: 45365a2
  337959: 8f9e359
  337951: 48c57ff
v: v3
  • Loading branch information
YAMANE Toshiaki authored and Greg Kroah-Hartman committed Nov 15, 2012
1 parent 5925c30 commit 484dcc3
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 696e3ca30aedcb11726050504b8e3c56bdc8285b
refs/heads/master: 11d3d27b69207348a8552ec4139a2c461905e2b2
4 changes: 2 additions & 2 deletions trunk/drivers/staging/omapdrm/omap_gem_dmabuf.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 484dcc3

Please sign in to comment.