diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2014-12-12 12:49:11 +0100 |
|---|---|---|
| committer | Stefan Agner <stefan.agner@toradex.com> | 2014-12-12 12:49:11 +0100 |
| commit | 74176705412ae0a638cd51eeb1cc1d3a1109c2d6 (patch) | |
| tree | 48917bca3070d17ea628df3f86c4c16382b09185 /drivers | |
| parent | 5663b6e69c8b72cefc22be7ebff02438d40e441a (diff) | |
| parent | 33a2a34e096e0a0f78ba2a46e26565e6941319a3 (diff) | |
Merge branch 'vf610-snvs-rtc' into toradex_vf_3.18-next
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/rtc/rtc-snvs.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-snvs.c b/drivers/rtc/rtc-snvs.c index d4a651268174..2cd8ffe5c698 100644 --- a/drivers/rtc/rtc-snvs.c +++ b/drivers/rtc/rtc-snvs.c @@ -346,7 +346,10 @@ static int snvs_rtc_resume(struct device *dev) } #endif -static SIMPLE_DEV_PM_OPS(snvs_rtc_pm_ops, snvs_rtc_suspend, snvs_rtc_resume); +static const struct dev_pm_ops snvs_rtc_pm_ops = { + .suspend_noirq = snvs_rtc_suspend, + .resume_noirq = snvs_rtc_resume, +}; static const struct of_device_id snvs_dt_ids[] = { { .compatible = "fsl,sec-v4.0-mon-rtc-lp", }, |