diff --git a/[refs] b/[refs]
index 67296a3b1d87..ad25fc068605 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9e3d3d07de1a9f2b83299653b75bfdbc0a8118f2
+refs/heads/master: 7a1904c32c5a18a1123fa0ea5040439337617877
diff --git a/trunk/drivers/input/serio/i8042.c b/trunk/drivers/input/serio/i8042.c
index 06b05dd22485..c2eea2767e10 100644
--- a/trunk/drivers/input/serio/i8042.c
+++ b/trunk/drivers/input/serio/i8042.c
@@ -1040,7 +1040,7 @@ static void __devinit i8042_register_ports(void)
 	}
 }
 
-static void __devinit i8042_unregister_ports(void)
+static void __devexit i8042_unregister_ports(void)
 {
 	int i;