diff --git a/[refs] b/[refs]
index 3bacb35531c0..66868999b2d0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f96b3074ecfedf74b137dc2cc00dccbf479d2713
+refs/heads/master: 60a1c4d41b3af91366bcb2a52b30b2050a48273e
diff --git a/trunk/drivers/power/reset/restart-poweroff.c b/trunk/drivers/power/reset/restart-poweroff.c
index b11b9e887174..059cd1501e2a 100644
--- a/trunk/drivers/power/reset/restart-poweroff.c
+++ b/trunk/drivers/power/reset/restart-poweroff.c
@@ -22,7 +22,7 @@ static void restart_poweroff_do_poweroff(void)
 	arm_pm_restart('h', NULL);
 }
 
-static int __devinit restart_poweroff_probe(struct platform_device *pdev)
+static int restart_poweroff_probe(struct platform_device *pdev)
 {
 	/* If a pm_power_off function has already been added, leave it alone */
 	if (pm_power_off != NULL) {
@@ -35,7 +35,7 @@ static int __devinit restart_poweroff_probe(struct platform_device *pdev)
 	return 0;
 }
 
-static int __devexit restart_poweroff_remove(struct platform_device *pdev)
+static int restart_poweroff_remove(struct platform_device *pdev)
 {
 	if (pm_power_off == &restart_poweroff_do_poweroff)
 		pm_power_off = NULL;
@@ -50,7 +50,7 @@ static const struct of_device_id of_restart_poweroff_match[] = {
 
 static struct platform_driver restart_poweroff_driver = {
 	.probe = restart_poweroff_probe,
-	.remove = __devexit_p(restart_poweroff_remove),
+	.remove = restart_poweroff_remove,
 	.driver = {
 		.name = "poweroff-restart",
 		.owner = THIS_MODULE,