summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/sleep.h
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-01-29 13:56:05 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-01-29 13:56:05 +0100
commit8a78cf70fae587b0691b4b982bc69c1261e05e76 (patch)
treec2b3aa89d4b64c7207250fb9ddff8fc5d717d486 /drivers/acpi/sleep.h
parent09212fddc8661e67a964d91a6584209784f52500 (diff)
parent65ab96f60621c4da8f1b4087a57b788bc4d8f27b (diff)
Merge branch 'acpi-pm' into acpi-cleanup
The following commits depend on the 'acpi-pm' material.
Diffstat (limited to 'drivers/acpi/sleep.h')
-rw-r--r--drivers/acpi/sleep.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/acpi/sleep.h b/drivers/acpi/sleep.h
index 74d59c8f467..0143540a251 100644
--- a/drivers/acpi/sleep.h
+++ b/drivers/acpi/sleep.h
@@ -6,3 +6,5 @@ extern void acpi_disable_wakeup_devices(u8 sleep_state);
extern struct list_head acpi_wakeup_device_list;
extern struct mutex acpi_device_lock;
+
+extern void acpi_resume_power_resources(void);