long dev_t patches from 2.6 tree

1 files changed, 3 insertions, 3 deletions

diff --git a/linux-core/drm_fops.c b/linux-core/drm_fops.c
index 771a2fa2..152cb4d7 100644
--- a/linux-core/drm_fops.c
+++ b/linux-core/drm_fops.c
@@ -52,7 +52,7 @@
  */
 int DRM(open_helper)(struct inode *inode, struct file *filp, drm_device_t *dev)
 {
-	int	     minor = minor(inode->i_rdev);
+	int	     minor = iminor(inode);
 	drm_file_t   *priv;
 
 	if (filp->f_flags & O_EXCL)   return -EBUSY; /* No exclusive opens */
@@ -114,7 +114,7 @@ int DRM(flush)(struct file *filp)
 	drm_device_t  *dev    = priv->dev;
 
 	DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %d\n",
-		  current->pid, (long)dev->device, dev->open_count);
+		  current->pid, (long)old_encode_dev(dev->device), dev->open_count);
 	return 0;
 }
 
@@ -125,7 +125,7 @@ int DRM(fasync)(int fd, struct file *filp, int on)
 	drm_device_t  *dev    = priv->dev;
 	int	      retcode;
 
-	DRM_DEBUG("fd = %d, device = 0x%lx\n", fd, (long)dev->device);
+	DRM_DEBUG("fd = %d, device = 0x%lx\n", fd, (long)old_encode_dev(dev->device));
 	retcode = fasync_helper(fd, filp, on, &dev->buf_async);
 	if (retcode < 0) return retcode;
 	return 0;