diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-07-24 05:42:34 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-07-24 05:42:34 -0400 |
| commit | 43cbd286fbba4bfb0c2ef05dc62522dfd5a2c000 (patch) | |
| tree | 7184a24f04c72987e725e50e66db530e6f618220 /include/linux/pm_wakeup.h | |
| parent | fee4b700a4e9e446151eb5a03874ca8666323113 (diff) | |
| parent | c5ae4dca11523dff15cfb1763b64a71b805976aa (diff) | |
Merge tag 'asoc-v3.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for v3.11
A few small updates again, the sgtl5000 one fixes some newly triggered
issues due to some probe ordering changes which were introduced in the
last merge window.
Diffstat (limited to 'include/linux/pm_wakeup.h')
| -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 569781faa504..a0f70808d7f4 100644 --- a/include/linux/pm_wakeup.h +++ b/include/linux/pm_wakeup.h | |||
| @@ -36,8 +36,8 @@ | |||
| 36 | * @last_time: Monotonic clock when the wakeup source's was touched last time. | 36 | * @last_time: Monotonic clock when the wakeup source's was touched last time. |
| 37 | * @prevent_sleep_time: Total time this source has been preventing autosleep. | 37 | * @prevent_sleep_time: Total time this source has been preventing autosleep. |
| 38 | * @event_count: Number of signaled wakeup events. | 38 | * @event_count: Number of signaled wakeup events. |
| 39 | * @active_count: Number of times the wakeup sorce was activated. | 39 | * @active_count: Number of times the wakeup source was activated. |
| 40 | * @relax_count: Number of times the wakeup sorce was deactivated. | 40 | * @relax_count: Number of times the wakeup source was deactivated. |
| 41 | * @expire_count: Number of times the wakeup source's timeout has expired. | 41 | * @expire_count: Number of times the wakeup source's timeout has expired. |
| 42 | * @wakeup_count: Number of times the wakeup source might abort suspend. | 42 | * @wakeup_count: Number of times the wakeup source might abort suspend. |
| 43 | * @active: Status of the wakeup source. | 43 | * @active: Status of the wakeup source. |