diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-11-21 10:31:42 -0500 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-11-21 10:31:42 -0500 |
| commit | 0a924200ae5fcf7b3d237d92a110545b6db6aa18 (patch) | |
| tree | 2b6543b97264c11f0e948b568ec397c50d54eb76 /drivers/cpuidle/cpuidle-arm64.c | |
| parent | a74a5a3381c0f600d390e3997976c4ddf31417ab (diff) | |
| parent | b82b6cca488074da3852e8a54fde1d9f74bf1557 (diff) | |
Merge back earlier cpuidle material for 3.19-rc1.
Conflicts:
drivers/cpuidle/dt_idle_states.c
Diffstat (limited to 'drivers/cpuidle/cpuidle-arm64.c')
| -rw-r--r-- | drivers/cpuidle/cpuidle-arm64.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/cpuidle/cpuidle-arm64.c b/drivers/cpuidle/cpuidle-arm64.c index 1b10f92ecd5a..80704b931ba4 100644 --- a/drivers/cpuidle/cpuidle-arm64.c +++ b/drivers/cpuidle/cpuidle-arm64.c | |||
| @@ -73,7 +73,6 @@ static struct cpuidle_driver arm64_idle_driver = { | |||
| 73 | .exit_latency = 1, | 73 | .exit_latency = 1, |
| 74 | .target_residency = 1, | 74 | .target_residency = 1, |
| 75 | .power_usage = UINT_MAX, | 75 | .power_usage = UINT_MAX, |
| 76 | .flags = CPUIDLE_FLAG_TIME_VALID, | ||
| 77 | .name = "WFI", | 76 | .name = "WFI", |
| 78 | .desc = "ARM64 WFI", | 77 | .desc = "ARM64 WFI", |
| 79 | } | 78 | } |