diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-11-18 03:21:39 +0300 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-11-18 03:21:39 +0300 |
commit | 2e015da0d5f756c1b8a06158700238022671168b (patch) | |
tree | 69078c28231a4b5f5ce4cf3dda9c73174fcc4ff7 /include/linux | |
parent | fc14f9c1272f62c3e8d01300f52467c0d9af50f9 (diff) | |
parent | 00e7c295968d74f4dbb00aef8334fafe788e3c89 (diff) | |
download | linux-2e015da0d5f756c1b8a06158700238022671168b.tar.xz |
Merge back 'pm-domains' material for 3.19-rc1.
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/pm.h | 6 | ||||
-rw-r--r-- | include/linux/pm_domain.h | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/include/linux/pm.h b/include/linux/pm.h index 383fd68aaee1..45e3e78c1e3a 100644 --- a/include/linux/pm.h +++ b/include/linux/pm.h @@ -538,11 +538,7 @@ enum rpm_request { }; struct wakeup_source; - -struct pm_domain_data { - struct list_head list_node; - struct device *dev; -}; +struct pm_domain_data; struct pm_subsys_data { spinlock_t lock; diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h index 2e0e06daf8c0..9d254e25f866 100644 --- a/include/linux/pm_domain.h +++ b/include/linux/pm_domain.h @@ -100,6 +100,11 @@ struct gpd_timing_data { bool cached_stop_ok; }; +struct pm_domain_data { + struct list_head list_node; + struct device *dev; +}; + struct generic_pm_domain_data { struct pm_domain_data base; struct gpd_timing_data td; |