commit 8562b3f25d6e23c9d9e48a32672944d1e8a2aa97
author Dave Airlie <airlied@optimus.(none)> Mon Nov 05 12:37:41 2007 +1000
committer Dave Airlie <airlied@redhat.com> Thu Feb 07 15:09:38 2008 +1000
tree f1fdadd4a7f40c9bf2b67e2c8307c4fba1a06d6e
parent 488b5ec871191359b9b79262a3d48456dae7ea5f

drm: some minor cleanups and changes to make memory manager merging easier.

Signed-off-by: Dave Airlie <airlied@linux.ie>

drivers/char/drm/drm_proc.c

diff --git a/drivers/char/drm/drm_proc.c b/drivers/char/drm/drm_proc.c
index 12dfea8..d9b560f 100644
--- a/drivers/char/drm/drm_proc.c
+++ b/drivers/char/drm/drm_proc.c
@@ -236,11 +236,11 @@
 			type = "??";
 		else
 			type = types[map->type];
-		DRM_PROC_PRINT("%4d 0x%08lx 0x%08lx %4.4s  0x%02x 0x%08x ",
+		DRM_PROC_PRINT("%4d 0x%08lx 0x%08lx %4.4s  0x%02x 0x%08lx ",
 			       i,
 			       map->offset,
 			       map->size, type, map->flags,
-			       r_list->user_token);
+			       (unsigned long) r_list->user_token);
 		if (map->mtrr < 0) {
 			DRM_PROC_PRINT("none\n");
 		} else {