summaryrefslogtreecommitdiff
path: root/arch/arm/configs/h5000_defconfig
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2020-03-11 18:45:26 +0000
committerMark Brown <broonie@kernel.org>2020-03-11 18:45:26 +0000
commit4d90a4e677c5c45c787a774c84442e75c7ddd5be (patch)
tree50312d13362dd49615148661ae7e6d91ac349719 /arch/arm/configs/h5000_defconfig
parent9032cdd96a2d4b0ef2f43499328f8a68050be2ec (diff)
parent2c523b344dfa65a3738e7039832044aa133c75fb (diff)
Merge tag 'v5.6-rc5' into asoc-5.7
Linux 5.6-rc5
Diffstat (limited to 'arch/arm/configs/h5000_defconfig')
-rw-r--r--arch/arm/configs/h5000_defconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/h5000_defconfig b/arch/arm/configs/h5000_defconfig
index 3946c6087327..f5a338fefda8 100644
--- a/arch/arm/configs/h5000_defconfig
+++ b/arch/arm/configs/h5000_defconfig
@@ -10,7 +10,6 @@ CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
CONFIG_MODULE_FORCE_UNLOAD=y
# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_CFQ is not set
CONFIG_ARCH_PXA=y
CONFIG_MACH_H5000=y
CONFIG_AEABI=y