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
/
arm
/
configs
/
omap1_defconfig
diff --git
a/arch/arm/configs/omap1_defconfig
b/arch/arm/configs/omap1_defconfig
index 40fdf890a2921c3c8bffa0262c751ca2b6b7ea90..82af77c093f16dd34dc924a1e2642e4e7a368591 100644
(file)
--- a/
arch/arm/configs/omap1_defconfig
+++ b/
arch/arm/configs/omap1_defconfig
@@
-17,7
+17,6
@@
CONFIG_OPROFILE=y
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
CONFIG_MODULE_FORCE_UNLOAD=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