git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
[pandora-kernel.git]
/
arch
/
x86
/
Kconfig.cpu
diff --git
a/arch/x86/Kconfig.cpu
b/arch/x86/Kconfig.cpu
index
f20ddf8
..
a198293
100644
(file)
--- a/
arch/x86/Kconfig.cpu
+++ b/
arch/x86/Kconfig.cpu
@@
-319,7
+319,7
@@
config X86_L1_CACHE_SHIFT
config X86_XADD
def_bool y
- depends on X86_
32 &&
!M386
+ depends on X86_
64 ||
!M386
config X86_PPRO_FENCE
bool "PentiumPro memory ordering errata workaround"