Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / drivers / cpuidle / cpuidle-ux500.c

diff --git a/drivers/cpuidle/cpuidle-ux500.c b/drivers/cpuidle/cpuidle-ux500.c
index 56fb729dac6454008f57053b55e63eca82ab3164..66f81e410f0d3b6bc6ce7b3bcb73eaa41cb8d3aa 100644 (file)
--- a/drivers/cpuidle/cpuidle-ux500.c
+++ b/drivers/cpuidle/cpuidle-ux500.c
@@ -101,8 +101,7 @@ static struct cpuidle_driver ux500_idle_driver = {
                        .enter            = ux500_enter_idle,
                        .exit_latency     = 70,
                        .target_residency = 260,
-                       .flags            = CPUIDLE_FLAG_TIME_VALID |
-                                           CPUIDLE_FLAG_TIMER_STOP,
+                       .flags            = CPUIDLE_FLAG_TIMER_STOP,
                        .name             = "ApIdle",
                        .desc             = "ARM Retention",
                },