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 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
[sfrench/cifs-2.6.git]
/
arch
/
arc
/
configs
/
nsimosci_hs_defconfig
diff --git
a/arch/arc/configs/nsimosci_hs_defconfig
b/arch/arc/configs/nsimosci_hs_defconfig
index 5b5e26d67955ae46a093366bcf591b0e69043b23..248a2c3bdc12987ae8d39b5edef42245824f5259 100644
(file)
--- a/
arch/arc/configs/nsimosci_hs_defconfig
+++ b/
arch/arc/configs/nsimosci_hs_defconfig
@@
-17,7
+17,6
@@
CONFIG_PERF_EVENTS=y
# CONFIG_COMPAT_BRK is not set
CONFIG_KPROBES=y
CONFIG_MODULES=y
-# CONFIG_LBDAF is not set
# CONFIG_BLK_DEV_BSG is not set
# CONFIG_IOSCHED_DEADLINE is not set
# CONFIG_IOSCHED_CFQ is not set