From 8c5f8d925a5f9a79ad23606bb1e6259c1c7eaced Mon Sep 17 00:00:00 2001
From: YAMANE Toshiaki <yamanetoshi@gmail.com>
Date: Wed, 14 Nov 2012 19:40:29 +0900
Subject: [PATCH] --- yaml --- r: 337968 b: refs/heads/master c:
 b1ca079e7eb6ca862247fe694f320367bd962a24 h: refs/heads/master v: v3

---
 [refs]                                           | 2 +-
 trunk/drivers/staging/omapdrm/omap_gem_helpers.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index dcc5001bc2ef..6aaccadaf55f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 11d3d27b69207348a8552ec4139a2c461905e2b2
+refs/heads/master: b1ca079e7eb6ca862247fe694f320367bd962a24
diff --git a/trunk/drivers/staging/omapdrm/omap_gem_helpers.c b/trunk/drivers/staging/omapdrm/omap_gem_helpers.c
index f895363a5e54..1b5411047531 100644
--- a/trunk/drivers/staging/omapdrm/omap_gem_helpers.c
+++ b/trunk/drivers/staging/omapdrm/omap_gem_helpers.c
@@ -32,7 +32,7 @@
  * @obj: obj in question
  * @gfpmask: gfp mask of requested pages
  */
-struct page ** _drm_gem_get_pages(struct drm_gem_object *obj, gfp_t gfpmask)
+struct page **_drm_gem_get_pages(struct drm_gem_object *obj, gfp_t gfpmask)
 {
 	struct inode *inode;
 	struct address_space *mapping;