diff --git a/[refs] b/[refs]
index 83141a94bb90..9051a1d54fde 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 55457161fdbdb5fe9eeb5027e720462a3fbdcb57
+refs/heads/master: 2c83071ead8e2668de69e8659944599c887a12c7
diff --git a/trunk/drivers/rtc/rtc-parisc.c b/trunk/drivers/rtc/rtc-parisc.c
index 620b949e4f3d..f4e871c30d25 100644
--- a/trunk/drivers/rtc/rtc-parisc.c
+++ b/trunk/drivers/rtc/rtc-parisc.c
@@ -62,8 +62,7 @@ static struct platform_driver parisc_rtc_driver = {
 		.name = "rtc-parisc",
 		.owner = THIS_MODULE,
 	},
-	.probe = parisc_rtc_probe,
-	.remove = __devexit_p(parisc_rtc_remove),
+	.remove = __exit_p(parisc_rtc_remove),
 };
 
 static int __init parisc_rtc_init(void)