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 tag 'rpmsg-v4.14-fixes' of git://github.com/andersson/remoteproc
[sfrench/cifs-2.6.git]
/
arch
/
arc
/
configs
/
haps_hs_smp_defconfig
diff --git
a/arch/arc/configs/haps_hs_smp_defconfig
b/arch/arc/configs/haps_hs_smp_defconfig
index 821a2e562f3f12422844556630d7136ad63097a8..3507be2af6fe3684f4acca6de7009903da82b97e 100644
(file)
--- a/
arch/arc/configs/haps_hs_smp_defconfig
+++ b/
arch/arc/configs/haps_hs_smp_defconfig
@@
-84,5
+84,5
@@
CONFIG_TMPFS=y
CONFIG_NFS_FS=y
# CONFIG_ENABLE_WARN_DEPRECATED is not set
# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_LOCKUP_DETECTOR=y
+CONFIG_
SOFT
LOCKUP_DETECTOR=y
# CONFIG_DEBUG_PREEMPT is not set