diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-08 20:00:09 +0100 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-08 20:00:09 +0100 |
commit | 648fcab2b060f82dc0138529af380171a2566d94 (patch) | |
tree | 1e34222d0f3bf463b07a6d1e4fd9c9423b975a89 /arch/arm/include | |
parent | 389cbf36e50a62c6ea6430c576b5f31ab7ccfae6 (diff) | |
parent | 0c570c183ace73f06e42d65432bf938fbdde6524 (diff) | |
download | linux-648fcab2b060f82dc0138529af380171a2566d94.tar.gz linux-648fcab2b060f82dc0138529af380171a2566d94.tar.bz2 linux-648fcab2b060f82dc0138529af380171a2566d94.zip |
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')
-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, .exit_latency = 1,\ .target_residency = 1,\ .power_usage = p,\ - .flags = CPUIDLE_FLAG_TIME_VALID,\ .name = "WFI",\ .desc = "ARM WFI",\ } |