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/mips | |
| 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/mips')
| -rw-r--r-- | arch/mips/include/asm/idle.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mips/include/asm/idle.h b/arch/mips/include/asm/idle.h index 1c967abd545c..a2d18ab57ac6 100644 --- a/arch/mips/include/asm/idle.h +++ b/arch/mips/include/asm/idle.h @@ -22,7 +22,6 @@ extern int mips_cpuidle_wait_enter(struct cpuidle_device *dev, .exit_latency = 1,\ .target_residency = 1,\ .power_usage = UINT_MAX,\ - .flags = CPUIDLE_FLAG_TIME_VALID,\ .name = "wait",\ .desc = "MIPS wait",\ } |