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 'mips_5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
configs
/
u300_defconfig
diff --git
a/arch/arm/configs/u300_defconfig
b/arch/arm/configs/u300_defconfig
index 36d77406e31b9b146c23ae48818a0f27171fcafb..831ba6a9ee8b30fb63fe6584eb081beccb7b43ed 100644
(file)
--- a/
arch/arm/configs/u300_defconfig
+++ b/
arch/arm/configs/u300_defconfig
@@
-9,7
+9,6
@@
CONFIG_EXPERT=y
# CONFIG_VM_EVENT_COUNTERS is not set
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
-# CONFIG_LBDAF is not set
# CONFIG_BLK_DEV_BSG is not set
CONFIG_PARTITION_ADVANCED=y
# CONFIG_IOSCHED_CFQ is not set