summaryrefslogtreecommitdiff
path: root/arch/arm/mach-ux500/pm/runtime.c
diff options
context:
space:
mode:
authorPhilippe Langlais <philippe.langlais@stericsson.com>2011-10-26 13:36:04 +0200
committerPhilippe Langlais <philippe.langlais@linaro.org>2012-03-19 08:48:55 +0100
commit6f83858d674ff3139e236aed26e74e8f95b7f758 (patch)
tree335482b17d7f8d33dcc323f45695ffc21e40efb5 /arch/arm/mach-ux500/pm/runtime.c
parent0a92cd0317853997bfc0f1a3d288294df51ee2ac (diff)
pm: pwr_domain renamed to pm_domain in 3.1
Signed-off-by: Philippe Langlais <philippe.langlais@stericsson.com>
Diffstat (limited to 'arch/arm/mach-ux500/pm/runtime.c')
-rw-r--r--arch/arm/mach-ux500/pm/runtime.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-ux500/pm/runtime.c b/arch/arm/mach-ux500/pm/runtime.c
index 34a85431824..ef27c87a3b9 100644
--- a/arch/arm/mach-ux500/pm/runtime.c
+++ b/arch/arm/mach-ux500/pm/runtime.c
@@ -279,7 +279,7 @@ static int ux500_pd_bus_notify(struct notifier_block *nb,
#endif /* CONFIG_PM_RUNTIME */
-struct dev_power_domain ux500_amba_dev_power_domain = {
+struct dev_pm_domain ux500_amba_dev_power_domain = {
.ops = {
/* USE_AMBA_PM_SLEEP_OPS minus the two we replace */
.prepare = amba_pm_prepare,
@@ -303,7 +303,7 @@ struct dev_power_domain ux500_amba_dev_power_domain = {
},
};
-struct dev_power_domain ux500_dev_power_domain = {
+struct dev_pm_domain ux500_dev_power_domain = {
.ops = {
/* USE_PLATFORM_PM_SLEEP_OPS minus the two we replace */
.prepare = platform_pm_prepare,