diff --git a/[refs] b/[refs]
index 332dc8afc3b2..c2078eb40402 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e22739d02a13bb2099084d135f90f4ac6b6d01e1
+refs/heads/master: fd6cf3dddfb06e8e06d62990c076c25211f79eec
diff --git a/trunk/drivers/input/input.c b/trunk/drivers/input/input.c
index 240ad39da570..a3d5485154e7 100644
--- a/trunk/drivers/input/input.c
+++ b/trunk/drivers/input/input.c
@@ -694,7 +694,7 @@ int input_set_keycode(struct input_dev *dev,
 		      unsigned int scancode, unsigned int keycode)
 {
 	unsigned long flags;
-	int old_keycode;
+	unsigned int old_keycode;
 	int retval;
 
 	if (keycode > KEY_MAX)