diff --git a/arch/arm64/configs/atoll_defconfig b/arch/arm64/configs/atoll_defconfig
index 7399c6e49f97..23dbeadc9882 100644
--- a/arch/arm64/configs/atoll_defconfig
+++ b/arch/arm64/configs/atoll_defconfig
@@ -66,6 +66,7 @@ CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y
 CONFIG_PARTITION_ADVANCED=y
 CONFIG_CFQ_GROUP_IOSCHED=y
 CONFIG_GKI_HACKS_TO_FIX=y
+CONFIG_DEFAULT_MQ_DEADLINE=y
 CONFIG_MQ_IOSCHED_DEADLINE=y
 CONFIG_ARCH_QCOM=y
 CONFIG_ARCH_ATOLL=y
@@ -1140,8 +1141,6 @@ CONFIG_SCHED_BORE=y
 # BFQ I/O Scheduler
 CONFIG_IOSCHED_BFQ=y
 CONFIG_BFQ_GROUP_IOSCHED=y
-CONFIG_DEFAULT_BFQ=y
-CONFIG_DEFAULT_IOSCHED="bfq"
 
 # ZEN
 CONFIG_ZEN_INTERACTIVE=y