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 branch 'linux-next' of git://git.infradead.org/ubi-2.6
[sfrench/cifs-2.6.git]
/
arch
/
mips
/
configs
/
pb1500_defconfig
diff --git
a/arch/mips/configs/pb1500_defconfig
b/arch/mips/configs/pb1500_defconfig
index af67ed4f71ae8bf3ad06f44e4a829c84b53cb528..e74ba794c789103f5daf3b315cbe552834ab7965 100644
(file)
--- a/
arch/mips/configs/pb1500_defconfig
+++ b/
arch/mips/configs/pb1500_defconfig
@@
-114,7
+114,6
@@
CONFIG_MIPS_MT_DISABLED=y
# CONFIG_MIPS_MT_SMTC is not set
# CONFIG_MIPS_VPE_LOADER is not set
CONFIG_64BIT_PHYS_ADDR=y
-CONFIG_CPU_HAS_LLSC=y
CONFIG_CPU_HAS_SYNC=y
CONFIG_GENERIC_HARDIRQS=y
CONFIG_GENERIC_IRQ_PROBE=y