summaryrefslogtreecommitdiffstats
path: root/drivers/base/power/wakeup.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2015-03-09 08:42:00 +0100
committerTakashi Iwai <tiwai@suse.de>2015-03-09 08:42:00 +0100
commit4aa01c408b7022c620241b373d4c3707a2ebeab6 (patch)
tree25df2a7453ec3bf7fc82f2871756b4efd6d3d283 /drivers/base/power/wakeup.c
parentALSA: ac97: ac97_patch: Simplify patch_vt1613_specific() (diff)
parentALSA: hda - Fix regression of HD-audio controller fallback modes (diff)
downloadlinux-4aa01c408b7022c620241b373d4c3707a2ebeab6.tar.xz
linux-4aa01c408b7022c620241b373d4c3707a2ebeab6.zip
Merge branch 'for-linus' into for-next
Merging the HD-audio fixes back to base devel branch for further working on it.
Diffstat (limited to 'drivers/base/power/wakeup.c')
-rw-r--r--drivers/base/power/wakeup.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
index c2744b30d5d9..aab7158d2afe 100644
--- a/drivers/base/power/wakeup.c
+++ b/drivers/base/power/wakeup.c
@@ -730,6 +730,7 @@ void pm_system_wakeup(void)
pm_abort_suspend = true;
freeze_wake();
}
+EXPORT_SYMBOL_GPL(pm_system_wakeup);
void pm_wakeup_clear(void)
{