summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-05-11 15:23:17 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-05-11 15:23:17 -0700
commitac4e01093f6d7b051c5d6a3e61ea5337774ac36a (patch)
tree395a03788c81aa0c3ba5cdcb3573365d5880bdc7 /include
parentc4cc75c3321cad6f20d1e5325293890255c8a663 (diff)
parent86239ceb33b0d8480b0f0ca0eec08e7f7a807374 (diff)
downloadlinux-stable-ac4e01093f6d7b051c5d6a3e61ea5337774ac36a.tar.gz
linux-stable-ac4e01093f6d7b051c5d6a3e61ea5337774ac36a.tar.bz2
linux-stable-ac4e01093f6d7b051c5d6a3e61ea5337774ac36a.zip
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
Pull idle update from Len Brown: "Add support for new Haswell-ULT CPU idle power states" * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux: intel_idle: initial C8, C9, C10 support tools/power turbostat: display C8, C9, C10 residency
Diffstat (limited to 'include')
-rw-r--r--include/linux/cpuidle.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h
index 3c86faa59798..8f0406230a0a 100644
--- a/include/linux/cpuidle.h
+++ b/include/linux/cpuidle.h
@@ -17,7 +17,7 @@
#include <linux/completion.h>
#include <linux/hrtimer.h>
-#define CPUIDLE_STATE_MAX 8
+#define CPUIDLE_STATE_MAX 10
#define CPUIDLE_NAME_LEN 16
#define CPUIDLE_DESC_LEN 32