diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-07-03 13:07:21 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-07-03 13:07:21 -0400 |
| commit | e3b8cdd8e4ea51e46d3ff54d7e3568afc24654ec (patch) | |
| tree | 0acfb0801d94d7222a752c40fb611dff00280803 /drivers/cpuidle/cpuidle.c | |
| parent | 80de3d7f416f1accd03f2e519ead32d6fde4fcf4 (diff) | |
| parent | 6e797a078824b30afbfae6cc4b1c2b21c51761ef (diff) | |
Merge branch 'pm-cpuidle' into pm-domains
* pm-cpuidle:
PM / cpuidle: Add driver reference counter
cpuidle: move field disable from per-driver to per-cpu
Diffstat (limited to 'drivers/cpuidle/cpuidle.c')
| -rw-r--r-- | drivers/cpuidle/cpuidle.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c index d90519cec880..04e4b7674a47 100644 --- a/drivers/cpuidle/cpuidle.c +++ b/drivers/cpuidle/cpuidle.c | |||
| @@ -265,7 +265,6 @@ static void poll_idle_init(struct cpuidle_driver *drv) | |||
| 265 | state->power_usage = -1; | 265 | state->power_usage = -1; |
| 266 | state->flags = 0; | 266 | state->flags = 0; |
| 267 | state->enter = poll_idle; | 267 | state->enter = poll_idle; |
| 268 | state->disable = 0; | ||
| 269 | } | 268 | } |
| 270 | #else | 269 | #else |
| 271 | static void poll_idle_init(struct cpuidle_driver *drv) {} | 270 | static void poll_idle_init(struct cpuidle_driver *drv) {} |