The patch titled
Subject: rtc-cmos: fix wakeup from S5 without CONFIG_PM_SLEEP
has been removed from the -mm tree. Its filename was
rtc-cmos-fix-wakeup-from-s5-without-config_pm_sleep.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Daniel Glöckner <[email protected]>
Subject: rtc-cmos: fix wakeup from S5 without CONFIG_PM_SLEEP
b5ada4600d ("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]>
---
drivers/rtc/rtc-cmos.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff -puN
drivers/rtc/rtc-cmos.c~rtc-cmos-fix-wakeup-from-s5-without-config_pm_sleep
drivers/rtc/rtc-cmos.c
--- a/drivers/rtc/rtc-cmos.c~rtc-cmos-fix-wakeup-from-s5-without-config_pm_sleep
+++ a/drivers/rtc/rtc-cmos.c
@@ -856,7 +856,7 @@ static void __exit cmos_do_remove(struct
cmos->dev = NULL;
}
-#ifdef CONFIG_PM_SLEEP
+#ifdef CONFIG_PM
static int cmos_suspend(struct device *dev)
{
@@ -907,6 +907,8 @@ static inline int cmos_poweroff(struct d
return cmos_suspend(dev);
}
+#ifdef CONFIG_PM_SLEEP
+
static int cmos_resume(struct device *dev)
{
struct cmos_rtc *cmos = dev_get_drvdata(dev);
@@ -954,6 +956,7 @@ static int cmos_resume(struct device *de
return 0;
}
+#endif
#else
static inline int cmos_poweroff(struct device *dev)
_
Patches currently in -mm which might be from [email protected] are
origin.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
