diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-06-19 02:18:14 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-06-19 02:18:14 +0300 |
| commit | 0d85fd42114ce97f209f3deb91ea0ac992c56013 (patch) | |
| tree | f177a06c6cff29818e93d9bd9bc1ad85781be34e /include/linux/pm.h | |
| parent | ab232ba57043ca85b55ffd7125f3f2c2d7e732ec (diff) | |
| parent | db874c7e10557f8f1af9a6fb1ec6589ae06f349c (diff) | |
| download | linux-0d85fd42114ce97f209f3deb91ea0ac992c56013.tar.xz | |
Merge branch 'pm-wakeirq'
* pm-wakeirq:
PM / wakeirq: Fix typo in prototype for dev_pm_set_dedicated_wake_irq
PM / Wakeirq: Add automated device wake IRQ handling
Diffstat (limited to 'include/linux/pm.h')
| -rw-r--r-- | include/linux/pm.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/pm.h b/include/linux/pm.h index 4890743892ef..35d599e7250d 100644 --- a/include/linux/pm.h +++ b/include/linux/pm.h @@ -541,6 +541,7 @@ enum rpm_request { }; struct wakeup_source; +struct wake_irq; struct pm_domain_data; struct pm_subsys_data { @@ -580,6 +581,7 @@ struct dev_pm_info { unsigned long timer_expires; struct work_struct work; wait_queue_head_t wait_queue; + struct wake_irq *wakeirq; atomic_t usage_count; atomic_t child_count; unsigned int disable_depth:3; |