diff options
author | Mark Brown <broonie@linaro.org> | 2013-12-18 17:24:24 +0000 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-12-18 17:24:41 +0000 |
commit | d1c8b1bd093cb57860fb6446e096e1c1cda92d4d (patch) | |
tree | 9c93ddf1ced6064a7f75a3f8a3691d09e624edb9 /drivers/idle/intel_idle.c | |
parent | d13733f4a24d93c582f22f17b5434cf195b7d505 (diff) | |
parent | 1b1ccee1e821e59c2a45c95b007aeb2c9dafd9be (diff) | |
download | blackbird-op-linux-d1c8b1bd093cb57860fb6446e096e1c1cda92d4d.tar.gz blackbird-op-linux-d1c8b1bd093cb57860fb6446e096e1c1cda92d4d.zip |
Merge tag 's2mps11-build' into regulator-s5m8767 since a following patch
depend on it.
regulator/clk: Fix s2mps11 build
This patch fixes a build failure that appeared in v3.13-rc4 due to an
RTC/MFD update merged via -mm.
Diffstat (limited to 'drivers/idle/intel_idle.c')
-rw-r--r-- | drivers/idle/intel_idle.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c index cbd4e9abc47e..92d1206482a6 100644 --- a/drivers/idle/intel_idle.c +++ b/drivers/idle/intel_idle.c @@ -329,7 +329,7 @@ static struct cpuidle_state atom_cstates[] __initdata = { { .enter = NULL } }; -static struct cpuidle_state avn_cstates[CPUIDLE_STATE_MAX] = { +static struct cpuidle_state avn_cstates[] __initdata = { { .name = "C1-AVN", .desc = "MWAIT 0x00", @@ -340,7 +340,7 @@ static struct cpuidle_state avn_cstates[CPUIDLE_STATE_MAX] = { { .name = "C6-AVN", .desc = "MWAIT 0x51", - .flags = MWAIT2flg(0x58) | CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED, + .flags = MWAIT2flg(0x51) | CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED, .exit_latency = 15, .target_residency = 45, .enter = &intel_idle }, |