diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-10-27 05:50:54 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-10-27 05:50:54 -0400 |
commit | 4944dd62de21230af039eda7cd218e9a09021d11 (patch) | |
tree | bac70f7bab8506c7e1b0408bacbdb0b1d77262e9 /arch/x86/Kconfig | |
parent | f17845e5d97ead8fbdadfd40039e058ec7cf4a42 (diff) | |
parent | 0173a3265b228da319ceb9c1ec6a5682fd1b2d92 (diff) |
Merge commit 'v2.6.28-rc2' into tracing/urgent
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r-- | arch/x86/Kconfig | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 100325c8605e..d11d7b513191 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
@@ -116,6 +116,9 @@ config GENERIC_TIME_VSYSCALL | |||
116 | config ARCH_HAS_CPU_RELAX | 116 | config ARCH_HAS_CPU_RELAX |
117 | def_bool y | 117 | def_bool y |
118 | 118 | ||
119 | config ARCH_HAS_DEFAULT_IDLE | ||
120 | def_bool y | ||
121 | |||
119 | config ARCH_HAS_CACHE_LINE_SIZE | 122 | config ARCH_HAS_CACHE_LINE_SIZE |
120 | def_bool y | 123 | def_bool y |
121 | 124 | ||
@@ -1635,6 +1638,8 @@ source "arch/x86/kernel/cpu/cpufreq/Kconfig" | |||
1635 | 1638 | ||
1636 | source "drivers/cpuidle/Kconfig" | 1639 | source "drivers/cpuidle/Kconfig" |
1637 | 1640 | ||
1641 | source "drivers/idle/Kconfig" | ||
1642 | |||
1638 | endmenu | 1643 | endmenu |
1639 | 1644 | ||
1640 | 1645 | ||