aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2010-12-15 15:01:22 -0800
committerH. Peter Anvin <hpa@linux.intel.com>2010-12-22 13:54:19 -0800
commit6feab6ac0822a0a17ee1b52dd6bc73759e850794 (patch)
tree1093dcf8ac7e63497487adb48779214a5db53c77
parent0a9a4daedffbb195aef2e08ad58ca2c232bbe18d (diff)
downloadmrst-s0i3-test-6feab6ac0822a0a17ee1b52dd6bc73759e850794.tar.gz
mrst-s0i3-test-6feab6ac0822a0a17ee1b52dd6bc73759e850794.tar.xz
mrst-s0i3-test-6feab6ac0822a0a17ee1b52dd6bc73759e850794.zip
intel_idle: fix building without CONFIG_MRST_S0I3
-rw-r--r--drivers/idle/intel_idle.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
index 4abb67f3554..6bef620ff2f 100644
--- a/drivers/idle/intel_idle.c
+++ b/drivers/idle/intel_idle.c
@@ -193,6 +193,7 @@ static struct cpuidle_state atom_cstates[MWAIT_MAX_NUM_CSTATES] = {
.enter = &intel_idle },
};
+#ifdef CONFIG_MRST_S0I3
static struct cpuidle_state mrst_cstates[MWAIT_MAX_NUM_CSTATES] = {
{ /* MWAIT C0 */ },
{ /* MWAIT C1 */
@@ -229,7 +230,6 @@ static struct cpuidle_state mrst_cstates[MWAIT_MAX_NUM_CSTATES] = {
.exit_latency = 140,
.target_residency = 560,
.enter = &mrst_idle, },
-#ifdef CONFIG_MRST_S0I3
{ /* MRST S0i3 */
.name = "MRST-S0i3",
.desc = "MRST S0i3",
@@ -239,8 +239,10 @@ static struct cpuidle_state mrst_cstates[MWAIT_MAX_NUM_CSTATES] = {
.exit_latency = 300, /* XXX */
.target_residency = 1200, /* XXX */
.enter = &mrst_idle },
-#endif
};
+#else
+#define mrst_cstates atom_cstates
+#endif
/**
* intel_idle