From d28e8b84ed730631790753266327d220893f8625 Mon Sep 17 00:00:00 2001 From: Guennadi Liakhovetski Date: Sat, 4 Feb 2012 22:26:49 +0100 Subject: [PATCH] --- yaml --- r: 291870 b: refs/heads/master c: 9b4f617b1c2004332113b4a2c89dfb6e8029c987 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/pm_domain.h | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2ac1a812ad0f..b9dd357a3a8d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dcaad77a8074b6de58e745546bc543d5538404f2 +refs/heads/master: 9b4f617b1c2004332113b4a2c89dfb6e8029c987 diff --git a/trunk/include/linux/pm_domain.h b/trunk/include/linux/pm_domain.h index e3ff87550eeb..e76cc9ae8233 100644 --- a/trunk/include/linux/pm_domain.h +++ b/trunk/include/linux/pm_domain.h @@ -101,12 +101,12 @@ struct generic_pm_domain_data { bool need_restore; }; +#ifdef CONFIG_PM_GENERIC_DOMAINS static inline struct generic_pm_domain_data *to_gpd_data(struct pm_domain_data *pdd) { return container_of(pdd, struct generic_pm_domain_data, base); } -#ifdef CONFIG_PM_GENERIC_DOMAINS static inline struct generic_pm_domain_data *dev_gpd_data(struct device *dev) { return to_gpd_data(dev->power.subsys_data->domain_data); @@ -207,6 +207,10 @@ static inline bool default_stop_ok(struct device *dev) return false; } #define pm_domain_always_on_gov NULL +static inline struct generic_pm_domain_data *dev_gpd_data(struct device *dev) +{ + return NULL; +} #endif static inline int pm_genpd_remove_callbacks(struct device *dev)