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 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[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 14ae7e5acc7c9cc381ebd9be04ad36a24b282a20..b6f2482c7e74355e09d7740ec4a1a0d9e8c51b59 100644
(file)
--- a/
arch/arc/configs/haps_hs_smp_defconfig
+++ b/
arch/arc/configs/haps_hs_smp_defconfig
@@
-78,7
+78,6
@@
CONFIG_EXT2_FS_XATTR=y
CONFIG_TMPFS=y
# CONFIG_MISC_FILESYSTEMS is not set
CONFIG_NFS_FS=y
-# CONFIG_ENABLE_WARN_DEPRECATED is not set
# CONFIG_ENABLE_MUST_CHECK is not set
CONFIG_SOFTLOCKUP_DETECTOR=y
# CONFIG_DEBUG_PREEMPT is not set