diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2011-10-21 18:21:52 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2011-10-21 18:21:52 -0400 |
| commit | d033e078566faed8c8f59baf97ee57ce2524ef5c (patch) | |
| tree | 46a98bf6a555ecbc8178baf6dd3a81553c3c3654 /include/linux/pm.h | |
| parent | 081a9d043c983f161b78fdc4671324d1342b86bc (diff) | |
| parent | 382414b93ac1e8ee7693be710e60c83eacc97c6f (diff) | |
Merge branch 'pm-domains' into pm-for-linus
* pm-domains:
ARM: mach-shmobile: sh7372 A4R support (v4)
ARM: mach-shmobile: sh7372 A3SP support (v4)
PM / Sleep: Mark devices involved in wakeup signaling during suspend
Diffstat (limited to 'include/linux/pm.h')
| -rw-r--r-- | include/linux/pm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pm.h b/include/linux/pm.h index 91f248bbe4fe..f15acb646813 100644 --- a/include/linux/pm.h +++ b/include/linux/pm.h | |||
| @@ -452,6 +452,7 @@ struct dev_pm_info { | |||
| 452 | struct list_head entry; | 452 | struct list_head entry; |
| 453 | struct completion completion; | 453 | struct completion completion; |
| 454 | struct wakeup_source *wakeup; | 454 | struct wakeup_source *wakeup; |
| 455 | bool wakeup_path:1; | ||
| 455 | #else | 456 | #else |
| 456 | unsigned int should_wakeup:1; | 457 | unsigned int should_wakeup:1; |
| 457 | #endif | 458 | #endif |