From: Daniel Glöckner <daniel-gl@gmx.net>
Date: Mon, 13 Oct 2014 22:53:16 +0000 (-0700)
Subject: rtc-cmos: fix wakeup from S5 without CONFIG_PM_SLEEP
X-Git-Tag: fixes-against-v3.18-rc2~79^2~70
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a882b14fe84951e236cd074e93575adc8a4be32e;p=pandora-kernel.git

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 <daniel-gl@gmx.net>
Cc: Mika Westerberg <mika.westerberg@linux.intel.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

Reading git-diff-tree failed