git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-x86
[sfrench/cifs-2.6.git]
/
arch
/
i386
/
Kconfig
diff --git
a/arch/i386/Kconfig
b/arch/i386/Kconfig
index d0a4ea1ba14d166d83c60fd269b1595d101bb742..d1bedbf9deb81d904894c7bbe797691e424f33d0 100644
(file)
--- a/
arch/i386/Kconfig
+++ b/
arch/i386/Kconfig
@@
-1080,7
+1080,7
@@
config APM_REAL_MODE_POWER_OFF
endif # APM
-source "arch/x86/kernel/cpu/cpufreq/Kconfig"
+source "arch/x86/kernel/cpu/cpufreq/Kconfig
_32
"
source "drivers/cpuidle/Kconfig"