diff --git a/[refs] b/[refs]
index d9e6277ebae2..c933adc8673e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 39fa58007a54b09c91cb7bf3ce3cfcc4957f92ff
+refs/heads/master: be15692310ec0e93998d763931089cb21386a058
diff --git a/trunk/drivers/input/serio/i8042.c b/trunk/drivers/input/serio/i8042.c
index 8e63e464d361..8f5b123e2ebc 100644
--- a/trunk/drivers/input/serio/i8042.c
+++ b/trunk/drivers/input/serio/i8042.c
@@ -802,8 +802,6 @@ static int i8042_controller_init(void)
  */
 static void i8042_controller_reset(void)
 {
-	unsigned char param;
-
 /*
  * Reset the controller if requested.
  */