From a4864a00269ffdde63f7bb19e07914be31689bec Mon Sep 17 00:00:00 2001 From: Jingoo Han Date: Mon, 29 Apr 2013 16:20:03 -0700 Subject: [PATCH] --- yaml --- r: 365790 b: refs/heads/master c: e4ae909b34a0a8d799712146a97b6ae67445a49a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/rtc/rtc-tps65910.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 9294a3d52ccd..0321150089d1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8070d0532a7bbe988df4b4360ce739a34a59d199 +refs/heads/master: e4ae909b34a0a8d799712146a97b6ae67445a49a diff --git a/trunk/drivers/rtc/rtc-tps65910.c b/trunk/drivers/rtc/rtc-tps65910.c index ef5d199af298..26b8bd252769 100644 --- a/trunk/drivers/rtc/rtc-tps65910.c +++ b/trunk/drivers/rtc/rtc-tps65910.c @@ -320,9 +320,8 @@ static int tps65910_rtc_resume(struct device *dev) } #endif -static const struct dev_pm_ops tps65910_rtc_pm_ops = { - SET_SYSTEM_SLEEP_PM_OPS(tps65910_rtc_suspend, tps65910_rtc_resume) -}; +static SIMPLE_DEV_PM_OPS(tps65910_rtc_pm_ops, tps65910_rtc_suspend, + tps65910_rtc_resume); static struct platform_driver tps65910_rtc_driver = { .probe = tps65910_rtc_probe,