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 master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mm
/
Kconfig
diff --git
a/arch/arm/mm/Kconfig
b/arch/arm/mm/Kconfig
index
fcc1e62
..
9d30c6f
100644
(file)
--- a/
arch/arm/mm/Kconfig
+++ b/
arch/arm/mm/Kconfig
@@
-644,7
+644,7
@@
config ARM_THUMBEE
config SWP_EMULATE
bool "Emulate SWP/SWPB instructions"
- depends on CPU_V7
+ depends on CPU_V7
&& !CPU_V6
select HAVE_PROC_CPU if PROC_FS
default y if SMP
help