diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-07-18 21:47:00 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-07-18 21:47:00 +0200 |
commit | 5a8d2815593007d4eb59f337ef919c871c2649ab (patch) | |
tree | 1bfbceb13c90b45bf0274f5430dcdbeea64427ff /include | |
parent | fc0ad6c7bb8c331bb0f20259d82e81318b0053be (diff) | |
parent | e8d05276f236ee6435e78411f62be9714e0b9377 (diff) |
Merge branch 'pm-fixes'
* pm-fixes:
cpufreq: Revert commit 2f7021a8 to fix CPU hotplug regression
cpufreq: s3c24xx: fix "depends on ARM_S3C24XX" in Kconfig
cpufreq: s3c24xx: rename CONFIG_CPU_FREQ_S3C24XX_DEBUGFS
PM / Sleep: Fix comment typo in pm_wakeup.h
PM / Sleep: avoid 'autosleep' in shutdown progress
cpufreq: Revert commit a66b2e to fix suspend/resume regression
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/pm_wakeup.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/pm_wakeup.h b/include/linux/pm_wakeup.h index 569781faa50..a0f70808d7f 100644 --- a/include/linux/pm_wakeup.h +++ b/include/linux/pm_wakeup.h @@ -36,8 +36,8 @@ * @last_time: Monotonic clock when the wakeup source's was touched last time. * @prevent_sleep_time: Total time this source has been preventing autosleep. * @event_count: Number of signaled wakeup events. - * @active_count: Number of times the wakeup sorce was activated. - * @relax_count: Number of times the wakeup sorce was deactivated. + * @active_count: Number of times the wakeup source was activated. + * @relax_count: Number of times the wakeup source was deactivated. * @expire_count: Number of times the wakeup source's timeout has expired. * @wakeup_count: Number of times the wakeup source might abort suspend. * @active: Status of the wakeup source. |