aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2011-02-10 18:04:52 -0500
committerRafael J. Wysocki <rjw@sisk.pl>2011-03-14 19:43:15 -0400
commitcd51e61cf4e8b220da37dc35e9c2dc2dc258b4de (patch)
treef2cb7a54e59b0bc238ac14f226214e0fc0817891 /kernel
parentcb8f51bdadb7969139c2e39c2defd4cde98c1ea8 (diff)
PM / ACPI: Remove references to pm_flags from bus.c
If direct references to pm_flags are removed from drivers/acpi/bus.c, CONFIG_ACPI will not need to depend on CONFIG_PM any more. Make that happen. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Acked-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/power/main.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/kernel/power/main.c b/kernel/power/main.c
index 701853042c28..b5405af48ddb 100644
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -17,10 +17,20 @@
17 17
18DEFINE_MUTEX(pm_mutex); 18DEFINE_MUTEX(pm_mutex);
19 19
20#ifdef CONFIG_PM_SLEEP
21
20unsigned int pm_flags; 22unsigned int pm_flags;
21EXPORT_SYMBOL(pm_flags); 23EXPORT_SYMBOL(pm_flags);
22 24
23#ifdef CONFIG_PM_SLEEP 25bool pm_apm_enabled(void)
26{
27 return !!(pm_flags & PM_APM);
28}
29
30void pm_set_acpi_flag(void)
31{
32 pm_flags |= PM_ACPI;
33}
24 34
25/* Routines for PM-transition notifications */ 35/* Routines for PM-transition notifications */
26 36