From c7bef1e26ecdc6a8cfa12044ed5e3a3306774f86 Mon Sep 17 00:00:00 2001
From: Jingoo Han <jg1.han@samsung.com>
Date: Mon, 29 Apr 2013 16:20:04 -0700
Subject: [PATCH] --- yaml --- r: 365791 b: refs/heads/master c:
 7d1376d80228b4ca6e1a0d1e8b88efc23a013f2c h: refs/heads/master i:   365789:
 c535824d44a70f6846285898fb51df94866397ba   365787:
 1df740471aebdff143192107c206ce4966c3fffc   365783:
 97ba96414090e4d8246ce75603a8d6623a642426   365775:
 325a81357fe4c9f1c130e08a78bc743e92a1aee3   365759:
 a9cb8d019deb8dedacb65bbd9556523e87b175fd v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/rtc/rtc-tps80031.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 0321150089d1..dadd35f10ab8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e4ae909b34a0a8d799712146a97b6ae67445a49a
+refs/heads/master: 7d1376d80228b4ca6e1a0d1e8b88efc23a013f2c
diff --git a/trunk/drivers/rtc/rtc-tps80031.c b/trunk/drivers/rtc/rtc-tps80031.c
index dc62d5fa2a29..72662eafb938 100644
--- a/trunk/drivers/rtc/rtc-tps80031.c
+++ b/trunk/drivers/rtc/rtc-tps80031.c
@@ -323,9 +323,8 @@ static int tps80031_rtc_resume(struct device *dev)
 };
 #endif
 
-static const struct dev_pm_ops tps80031_pm_ops = {
-	SET_SYSTEM_SLEEP_PM_OPS(tps80031_rtc_suspend, tps80031_rtc_resume)
-};
+static SIMPLE_DEV_PM_OPS(tps80031_pm_ops, tps80031_rtc_suspend,
+			tps80031_rtc_resume);
 
 static struct platform_driver tps80031_rtc_driver = {
 	.driver	= {