diff --git a/[refs] b/[refs]
index 8a70562979d9..a91cfffe87bb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0de1a57bedce0899c98da4c0910d4f38c9b7c8f4
+refs/heads/master: 55a5cb5d594c18b3147a2288b00ea359c1a38cf8
diff --git a/trunk/drivers/gpu/drm/radeon/r300_cmdbuf.c b/trunk/drivers/gpu/drm/radeon/r300_cmdbuf.c
index 7f59352cd637..ea46d558e8f3 100644
--- a/trunk/drivers/gpu/drm/radeon/r300_cmdbuf.c
+++ b/trunk/drivers/gpu/drm/radeon/r300_cmdbuf.c
@@ -767,7 +767,7 @@ static __inline__ int r300_emit_packet3(drm_radeon_private_t *dev_priv,
 		default:
 			DRM_ERROR("bad packet3 type %i at byte %d\n",
 				  header.packet3.packet,
-				  cmdbuf->buffer->iterator - sizeof(header));
+				  cmdbuf->buffer->iterator - (int)sizeof(header));
 			return -EINVAL;
 		}
 
@@ -1153,7 +1153,7 @@ int r300_do_cp_cmdbuf(struct drm_device *dev,
 		default:
 			DRM_ERROR("bad cmd_type %i at byte %d\n",
 				  header->header.cmd_type,
-				  cmdbuf->buffer->iterator - sizeof(*header));
+				  cmdbuf->buffer->iterator - (int)sizeof(*header));
 			ret = -EINVAL;
 			goto cleanup;
 		}