From: 黄涛 <huangtao@rock-chips.com>
Date: Mon, 1 Aug 2011 03:26:26 +0000 (+0800)
Subject: rk29: gpu: fix for v2.6.36
X-Git-Tag: firefly_0821_release~9795
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d91cf9f6ae68e6f0d488ae07dde9b890dec7fdfd;p=firefly-linux-kernel-4.4.55.git

rk29: gpu: fix for v2.6.36
---

diff --git a/drivers/staging/rk29/vivante/hal/os/linux/kernel/gc_hal_kernel_driver.c b/drivers/staging/rk29/vivante/hal/os/linux/kernel/gc_hal_kernel_driver.c
index 23e98d4ac297..5a51e129b1cb 100755
--- a/drivers/staging/rk29/vivante/hal/os/linux/kernel/gc_hal_kernel_driver.c
+++ b/drivers/staging/rk29/vivante/hal/os/linux/kernel/gc_hal_kernel_driver.c
@@ -181,7 +181,7 @@ int shutdown = 0;
 
 static int drv_open(struct inode *inode, struct file *filp);
 static int drv_release(struct inode *inode, struct file *filp);
-static int drv_ioctl(struct inode *inode, struct file *filp,
+static long drv_ioctl(struct file *filp,
                      unsigned int ioctlCode, unsigned long arg);
 static int drv_mmap(struct file * filp, struct vm_area_struct * vma);
 
@@ -189,7 +189,7 @@ struct file_operations driver_fops =
 {
     .open   	= drv_open,
     .release	= drv_release,
-    .ioctl  	= drv_ioctl,
+    .unlocked_ioctl	= drv_ioctl,
     .mmap   	= drv_mmap,
 };
 
@@ -385,8 +385,7 @@ int drv_release(struct inode* inode, struct file* filp)
     return 0;
 }
 
-int drv_ioctl(struct inode *inode,
-    	      struct file *filp, 
+long drv_ioctl(struct file *filp,
     	      unsigned int ioctlCode,
 	      unsigned long arg)
 {