diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-08 14:00:09 -0500 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-08 14:00:09 -0500 |
| commit | 648fcab2b060f82dc0138529af380171a2566d94 (patch) | |
| tree | 1e34222d0f3bf463b07a6d1e4fd9c9423b975a89 /arch/arm/include/asm/cpuidle.h | |
| parent | 389cbf36e50a62c6ea6430c576b5f31ab7ccfae6 (diff) | |
| parent | 0c570c183ace73f06e42d65432bf938fbdde6524 (diff) | |
Merge branch 'pm-cpuidle'
* pm-cpuidle:
cpuidle: add MAINTAINERS entry for ARM Exynos cpuidle driver
drivers: cpuidle: Remove cpuidle-arm64 duplicate error messages
drivers: cpuidle: Add idle-state-name description to ARM idle states
drivers: cpuidle: Add status property to ARM idle states
cpuidle: Invert CPUIDLE_FLAG_TIME_VALID logic
Diffstat (limited to 'arch/arm/include/asm/cpuidle.h')
| -rw-r--r-- | arch/arm/include/asm/cpuidle.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/include/asm/cpuidle.h b/arch/arm/include/asm/cpuidle.h index 2fca60ab513a..af319ac4960c 100644 --- a/arch/arm/include/asm/cpuidle.h +++ b/arch/arm/include/asm/cpuidle.h | |||
| @@ -15,7 +15,6 @@ static inline int arm_cpuidle_simple_enter(struct cpuidle_device *dev, | |||
| 15 | .exit_latency = 1,\ | 15 | .exit_latency = 1,\ |
| 16 | .target_residency = 1,\ | 16 | .target_residency = 1,\ |
| 17 | .power_usage = p,\ | 17 | .power_usage = p,\ |
| 18 | .flags = CPUIDLE_FLAG_TIME_VALID,\ | ||
| 19 | .name = "WFI",\ | 18 | .name = "WFI",\ |
| 20 | .desc = "ARM WFI",\ | 19 | .desc = "ARM WFI",\ |
| 21 | } | 20 | } |