diff options
author | Mark Brown <broonie@kernel.org> | 2020-03-11 18:45:26 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2020-03-11 18:45:26 +0000 |
commit | 4d90a4e677c5c45c787a774c84442e75c7ddd5be (patch) | |
tree | 50312d13362dd49615148661ae7e6d91ac349719 /arch/arm/configs/realview_defconfig | |
parent | 9032cdd96a2d4b0ef2f43499328f8a68050be2ec (diff) | |
parent | 2c523b344dfa65a3738e7039832044aa133c75fb (diff) | |
download | linux-4d90a4e677c5c45c787a774c84442e75c7ddd5be.tar.bz2 |
Merge tag 'v5.6-rc5' into asoc-5.7
Linux 5.6-rc5
Diffstat (limited to 'arch/arm/configs/realview_defconfig')
-rw-r--r-- | arch/arm/configs/realview_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/realview_defconfig b/arch/arm/configs/realview_defconfig index 8a056cc0c1ec..70e2c74a9f32 100644 --- a/arch/arm/configs/realview_defconfig +++ b/arch/arm/configs/realview_defconfig @@ -8,7 +8,6 @@ CONFIG_SLAB=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y # CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_CFQ is not set CONFIG_ARCH_MULTI_V6=y CONFIG_ARCH_REALVIEW=y CONFIG_MACH_REALVIEW_EB=y |