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/mach-imx/cpuidle-imx5.c | |
parent | Merge branches 'pm-domains', 'pm-sleep' and 'pm-tools' (diff) | |
parent | cpuidle: add MAINTAINERS entry for ARM Exynos cpuidle driver (diff) | |
download | linux-dev-648fcab2b060f82dc0138529af380171a2566d94.tar.xz linux-dev-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/mach-imx/cpuidle-imx5.c')
-rw-r--r-- | arch/arm/mach-imx/cpuidle-imx5.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/cpuidle-imx5.c b/arch/arm/mach-imx/cpuidle-imx5.c index 5a47e3c6172f..3feca526d16b 100644 --- a/arch/arm/mach-imx/cpuidle-imx5.c +++ b/arch/arm/mach-imx/cpuidle-imx5.c @@ -24,7 +24,6 @@ static struct cpuidle_driver imx5_cpuidle_driver = { .enter = imx5_cpuidle_enter, .exit_latency = 2, .target_residency = 1, - .flags = CPUIDLE_FLAG_TIME_VALID, .name = "IMX5 SRPG", .desc = "CPU state retained,powered off", }, |