diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-01-28 16:38:25 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-01-28 16:38:25 -0500 |
| commit | 0ada0a73120c28cc432bcdbac061781465c2f48f (patch) | |
| tree | d17cadd4ea47e25d9e48e7d409a39c84268fbd27 /kernel/power/main.c | |
| parent | 6016a363f6b56b46b24655bcfc0499b715851cf3 (diff) | |
| parent | 92dcffb916d309aa01778bf8963a6932e4014d07 (diff) | |
Merge commit 'v2.6.33-rc5' into secretlab/test-devicetree
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 | { |