From: Eric Anholt <eric@anholt.net>
Date: Thu, 16 Aug 2007 16:23:09 +0000 (-0700)
Subject: Merge branch 'master' into bo-set-pin
X-Git-Tag: submit/1.0/20121108.012404~1030^2~101^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0055fd5c35306a6363b0414f7f2220b3d1c27ecc;p=profile%2Fivi%2Flibdrm.git

Merge branch 'master' into bo-set-pin
---

0055fd5c35306a6363b0414f7f2220b3d1c27ecc
diff --cc linux-core/drm_drv.c
index 816b8a2,bb15987..cedb6d5
--- a/linux-core/drm_drv.c
+++ b/linux-core/drm_drv.c
@@@ -648,10 -653,10 +654,10 @@@ long drm_unlocked_ioctl(struct file *fi
  err_i1:
  	atomic_dec(&dev->ioctl_count);
  	if (retcode)
 -		DRM_DEBUG("ret = %x\n", retcode);
 +		DRM_DEBUG("ret = %d\n", retcode);
  	return retcode;
  }
- EXPORT_SYMBOL(drm_ioctl);
+ EXPORT_SYMBOL(drm_unlocked_ioctl);
  
  drm_local_map_t *drm_getsarea(struct drm_device *dev)
  {