diff --git a/[refs] b/[refs]
index 4162c9453e88..9294a3d52ccd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7d17158c0159e30e968a187cf964a145b9336ab7
+refs/heads/master: 8070d0532a7bbe988df4b4360ce739a34a59d199
diff --git a/trunk/drivers/rtc/rtc-tps6586x.c b/trunk/drivers/rtc/rtc-tps6586x.c
index b6aab9f80f73..badfea491a93 100644
--- a/trunk/drivers/rtc/rtc-tps6586x.c
+++ b/trunk/drivers/rtc/rtc-tps6586x.c
@@ -333,9 +333,8 @@ static int tps6586x_rtc_resume(struct device *dev)
 }
 #endif
 
-static const struct dev_pm_ops tps6586x_pm_ops = {
-	SET_SYSTEM_SLEEP_PM_OPS(tps6586x_rtc_suspend, tps6586x_rtc_resume)
-};
+static SIMPLE_DEV_PM_OPS(tps6586x_pm_ops, tps6586x_rtc_suspend,
+			tps6586x_rtc_resume);
 
 static struct platform_driver tps6586x_rtc_driver = {
 	.driver	= {