diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-11-21 16:31:42 +0100 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-11-21 16:31:42 +0100 |
commit | 0a924200ae5fcf7b3d237d92a110545b6db6aa18 (patch) | |
tree | 2b6543b97264c11f0e948b568ec397c50d54eb76 /arch/x86 | |
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 'arch/x86')
-rw-r--r-- | arch/x86/kernel/apm_32.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c index 584874451414..927ec9235947 100644 --- a/arch/x86/kernel/apm_32.c +++ b/arch/x86/kernel/apm_32.c @@ -378,7 +378,6 @@ static struct cpuidle_driver apm_idle_driver = { { /* entry 1 is for APM idle */ .name = "APM", .desc = "APM idle", - .flags = CPUIDLE_FLAG_TIME_VALID, .exit_latency = 250, /* WAG */ .target_residency = 500, /* WAG */ .enter = &apm_cpu_idle |