diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /kernel/power/main.c | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
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 | { |