diff --git a/[refs] b/[refs]
index 2638e6617186..672c90b2eb2a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b5e89ed53ed8d24f83ba1941c07382af00ed238e
+refs/heads/master: 13e4a9c85152a49ec10e682308581ab13b437470
diff --git a/trunk/drivers/char/drm/drm_bufs.c b/trunk/drivers/char/drm/drm_bufs.c
index bb989ccea5a0..e3d372ad0076 100644
--- a/trunk/drivers/char/drm/drm_bufs.c
+++ b/trunk/drivers/char/drm/drm_bufs.c
@@ -309,7 +309,7 @@ int drm_addmap_ioctl(struct inode *inode, struct file *filp,
 
 	if (copy_to_user(argp, maplist->map, sizeof(drm_map_t)))
 		return -EFAULT;
-	if (put_user(maplist->user_token, &argp->handle))
+	if (put_user((void *)maplist->user_token, &argp->handle))
 		return -EFAULT;
 	return 0;
 }