aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorAlan Stern <stern@rowland.harvard.edu>2008-03-19 17:37:42 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2008-04-19 22:10:25 -0400
commitd288e47c471e1090e80c62ad95882fafbf3f499d (patch)
treebfc8a880b49a0b7a0bb200ae0f0462f5523d0256 /drivers/base
parent74081f8667d73ad59961cf63be5f0e9d6a87c8a3 (diff)
PM: Make wakeup flags available whenever CONFIG_PM is set
The various wakeup flags and their accessor macros in struct dev_pm_info should be available whenever CONFIG_PM is enabled, not just when CONFIG_PM_SLEEP is on. Otherwise remote wakeup won't always be configurable for runtime power management. This patch (as1056b) fixes the oversight. David Brownell adds: More accurately, fixes the "regression" ... as noted sometime last summer, after 296699de6bdc717189a331ab6bbe90e05c94db06 introduced CONFIG_SUSPEND. But that didn't make the regression list for that kernel, ergo the delay in fixing it. [rjw: rebased] Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/power/main.c2
-rw-r--r--drivers/base/power/sysfs.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index 93a146940b91..5630af302b2f 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -57,8 +57,6 @@ static DEFINE_MUTEX(dpm_list_mtx);
57/* 'true' if all devices have been suspended, protected by dpm_list_mtx */ 57/* 'true' if all devices have been suspended, protected by dpm_list_mtx */
58static bool all_sleeping; 58static bool all_sleeping;
59 59
60int (*platform_enable_wakeup)(struct device *dev, int is_on);
61
62/** 60/**
63 * device_pm_add - add a device to the list of active devices 61 * device_pm_add - add a device to the list of active devices
64 * @dev: Device to be added to the list 62 * @dev: Device to be added to the list
diff --git a/drivers/base/power/sysfs.c b/drivers/base/power/sysfs.c
index f2ed179cd695..d11f74b038db 100644
--- a/drivers/base/power/sysfs.c
+++ b/drivers/base/power/sysfs.c
@@ -6,6 +6,8 @@
6#include <linux/string.h> 6#include <linux/string.h>
7#include "power.h" 7#include "power.h"
8 8
9int (*platform_enable_wakeup)(struct device *dev, int is_on);
10
9 11
10/* 12/*
11 * wakeup - Report/change current wakeup option for device 13 * wakeup - Report/change current wakeup option for device