diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-02-23 11:31:34 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-02-23 11:31:38 +0100 |
| commit | d927dc937910ad8c7350266cac70e42a5f0b48cf (patch) | |
| tree | c26c8ffa1d764bb7fea66118cc05bf7617b71c19 /kernel/power/main.c | |
| parent | 46e49b3836c7cd2ae5b5fe76fa981d0d292a52fe (diff) | |
| parent | f5412be599602124d2bdd49947b231dd77c0bf99 (diff) | |
| download | talos-op-linux-d927dc937910ad8c7350266cac70e42a5f0b48cf.tar.gz talos-op-linux-d927dc937910ad8c7350266cac70e42a5f0b48cf.zip | |
Merge commit 'v2.6.38-rc6' into sched/core
Merge reason: Pick up the latest fixes before queueing up new changes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/power/main.c')
| -rw-r--r-- | kernel/power/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/power/main.c b/kernel/power/main.c index 7b5db6a8561e..701853042c28 100644 --- a/kernel/power/main.c +++ b/kernel/power/main.c @@ -326,7 +326,7 @@ EXPORT_SYMBOL_GPL(pm_wq); static int __init pm_start_workqueue(void) { - pm_wq = alloc_workqueue("pm", WQ_FREEZEABLE, 0); + pm_wq = alloc_workqueue("pm", WQ_FREEZABLE, 0); return pm_wq ? 0 : -ENOMEM; } |
