diff options
| author | Daniel Glöckner <[email protected]> | 2014-10-13 15:53:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2014-10-14 02:18:19 +0200 |
| commit | a882b14fe84951e236cd074e93575adc8a4be32e (patch) | |
| tree | 66d52ce2c8ce9eeb9b8b2f6bc38c26ff8fa7895d /tools/perf/scripts | |
| parent | 706b632d042c87a288f8b9adc8b6c83207e6d452 (diff) | |
rtc-cmos: fix wakeup from S5 without CONFIG_PM_SLEEP
Commit b5ada4600dfd ("drivers/rtc/rtc-cmos.c: fix compilation warning
when !CONFIG_PM_SLEEP") broke wakeup from S5 by making cmos_poweroff a
nop unless CONFIG_PM_SLEEP was defined.
Fix this by restricting the #ifdef to cmos_resume and restoring the old
dependency on CONFIG_PM for cmos_suspend and cmos_poweroff.
Signed-off-by: Daniel Glöckner <[email protected]>
Cc: Mika Westerberg <[email protected]>
Cc: Alessandro Zummo <[email protected]>
Cc: <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
Diffstat (limited to 'tools/perf/scripts')
0 files changed, 0 insertions, 0 deletions