summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2011-08-08 23:43:50 +0200
committerRafael J. Wysocki <rjw@sisk.pl>2011-08-25 15:33:45 +0200
commit17877eb5a900f32bb5827a7b2109b6c9adff5fc3 (patch)
tree40071b242874b486e8a5fdc36b0bdf0ba9ccbe00 /include/linux
parent5063ce1571b73865cbdcd92db002e85809750c97 (diff)
downloadblackbird-op-linux-17877eb5a900f32bb5827a7b2109b6c9adff5fc3.tar.gz
blackbird-op-linux-17877eb5a900f32bb5827a7b2109b6c9adff5fc3.zip
PM / Domains: Rename GPD_STATE_WAIT_PARENT to GPD_STATE_WAIT_MASTER
Since it is now possible for a PM domain to have multiple masters instead of one parent, rename the "wait for parent" status to reflect the new situation. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/pm_domain.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h
index 5f5154d79253..bf679f59f9a8 100644
--- a/include/linux/pm_domain.h
+++ b/include/linux/pm_domain.h
@@ -13,7 +13,7 @@
enum gpd_status {
GPD_STATE_ACTIVE = 0, /* PM domain is active */
- GPD_STATE_WAIT_PARENT, /* PM domain's parent is being waited for */
+ GPD_STATE_WAIT_MASTER, /* PM domain's master is being waited for */
GPD_STATE_BUSY, /* Something is happening to the PM domain */
GPD_STATE_REPEAT, /* Power off in progress, to be repeated */
GPD_STATE_POWER_OFF, /* PM domain is off */
OpenPOWER on IntegriCloud