projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'ceph-for-5.7-rc1' of git://github.com/ceph/ceph-client
[linux-2.6-microblaze.git]
/
arch
/
um
/
configs
/
i386_defconfig
diff --git
a/arch/um/configs/i386_defconfig
b/arch/um/configs/i386_defconfig
index
73e98bb
..
fb51bd2
100644
(file)
--- a/
arch/um/configs/i386_defconfig
+++ b/
arch/um/configs/i386_defconfig
@@
-26,7
+26,7
@@
CONFIG_SLAB=y
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
# CONFIG_BLK_DEV_BSG is not set
-CONFIG_IOSCHED_
C
FQ=m
+CONFIG_IOSCHED_
B
FQ=m
CONFIG_SSL=y
CONFIG_NULL_CHAN=y
CONFIG_PORT_CHAN=y