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 = {