diff --git a/[refs] b/[refs]
index b872dd5b67e3..5906dc4dd837 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cdec2f82b11afbe4933fa9a9b3ed567db14fd237
+refs/heads/master: 507c0185a72e89002757a58f6c64de3df84da0de
diff --git a/trunk/drivers/char/drm/drm_drawable.c b/trunk/drivers/char/drm/drm_drawable.c
index ce7a027b0ad4..de37d5f74563 100644
--- a/trunk/drivers/char/drm/drm_drawable.c
+++ b/trunk/drivers/char/drm/drm_drawable.c
@@ -132,7 +132,8 @@ int drm_rmdraw(DRM_IOCTL_ARGS)
 {
 	DRM_DEVICE;
 	drm_draw_t draw;
- 	unsigned int id, idx, shift;
+ 	int id, idx;
+ 	unsigned int shift;
 	unsigned long irqflags;
 	u32 *bitfield = dev->drw_bitfield;
 	unsigned int bitfield_length = dev->drw_bitfield_length;