diff options
| author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2015-10-25 12:38:20 +0200 |
|---|---|---|
| committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2015-10-25 12:38:20 +0200 |
| commit | 10d15322ed26652263a579bcb59dfd49ab8a30de (patch) | |
| tree | b1497de1b8ffd34b991cdf6e21de1c7a0a65f1de /kernel/cpu_pm.c | |
| parent | 0316d30ea3e66379cd30ed70a114bc282159bb4c (diff) | |
| parent | e5a9f8d04660da7ef3a98260aa74c3976f9cb4cd (diff) | |
Merge remote-tracking branch 'mac80211-next/master' into next
Diffstat (limited to 'kernel/cpu_pm.c')
| -rw-r--r-- | kernel/cpu_pm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/cpu_pm.c b/kernel/cpu_pm.c index 9656a3c36503..009cc9a17d95 100644 --- a/kernel/cpu_pm.c +++ b/kernel/cpu_pm.c @@ -180,7 +180,7 @@ EXPORT_SYMBOL_GPL(cpu_cluster_pm_enter); * low power state that may have caused some blocks in the same power domain * to reset. * - * Must be called after cpu_pm_exit has been called on all cpus in the power + * Must be called after cpu_cluster_pm_enter has been called for the power * domain, and before cpu_pm_exit has been called on any cpu in the power * domain. Notified drivers can include VFP co-processor, interrupt controller * and its PM extensions, local CPU timers context save/restore which |