diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-15 04:29:06 -0500 | 
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-15 04:29:06 -0500 | 
| commit | 709334c87dbdb44150ce436b3d13c814db0dcae9 (patch) | |
| tree | 5861a45f70c1f283720337abd864498f5afb3dbe /kernel/power/main.c | |
| parent | 0d64b568fcd48b133721c1d322e7c51d85eb12df (diff) | |
| parent | f74890277a196949e4004fe2955e1d4fb3930f98 (diff) | |
Merge branch 'fixes' of git://git.alsa-project.org/alsa-kernel into for-linus
Diffstat (limited to 'kernel/power/main.c')
| -rw-r--r-- | kernel/power/main.c | 1 | 
1 files changed, 1 insertions, 0 deletions
| diff --git a/kernel/power/main.c b/kernel/power/main.c index 347d2cc88cd0..0998c7139053 100644 --- a/kernel/power/main.c +++ b/kernel/power/main.c | |||
| @@ -220,6 +220,7 @@ static struct attribute_group attr_group = { | |||
| 220 | 220 | ||
| 221 | #ifdef CONFIG_PM_RUNTIME | 221 | #ifdef CONFIG_PM_RUNTIME | 
| 222 | struct workqueue_struct *pm_wq; | 222 | struct workqueue_struct *pm_wq; | 
| 223 | EXPORT_SYMBOL_GPL(pm_wq); | ||
| 223 | 224 | ||
| 224 | static int __init pm_start_workqueue(void) | 225 | static int __init pm_start_workqueue(void) | 
| 225 | { | 226 | { | 
