From: Rafael J. Wysocki Date: Thu, 24 Feb 2011 10:10:01 +0000 (+0100) Subject: PM: Make ACPI wakeup from S5 work again when CONFIG_PM_SLEEP is unset X-Git-Tag: v2.6.38-rc7~12^2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=805bdaec1a44155db35f6ee5410d6bbc365324a8;p=pandora-kernel.git PM: Make ACPI wakeup from S5 work again when CONFIG_PM_SLEEP is unset Commit 074037e (PM / Wakeup: Introduce wakeup source objects and event statistics (v3)) caused ACPI wakeup to only work if CONFIG_PM_SLEEP is set, but it also worked for CONFIG_PM_SLEEP unset before. This can be fixed by making device_set_wakeup_enable(), device_init_wakeup() and device_may_wakeup() work in the same way as before commit 074037e when CONFIG_PM_SLEEP is unset. Reported-and-tested-by: Justin Maggard Cc: stable@kernel.org Signed-off-by: Rafael J. Wysocki --- Reading git-diff-tree failed