summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs/stm32_defconfig
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2020-03-27 22:36:17 +0100
committerLinus Walleij <linus.walleij@linaro.org>2020-03-27 22:36:17 +0100
commit06dd3f31cb70035cbd3f507c11fd50e3089aeb81 (patch)
tree98065919df104fba32191f2464f4193a998cd6a1 /arch/arm/configs/stm32_defconfig
parenttools: gpio: Fix out-of-tree build regression (diff)
parentLinux 5.6-rc7 (diff)
downloadlinux-06dd3f31cb70035cbd3f507c11fd50e3089aeb81.tar.xz
linux-06dd3f31cb70035cbd3f507c11fd50e3089aeb81.zip
Merge tag 'v5.6-rc7' into devel
Linux 5.6-rc7
Diffstat (limited to 'arch/arm/configs/stm32_defconfig')
-rw-r--r--arch/arm/configs/stm32_defconfig2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/configs/stm32_defconfig b/arch/arm/configs/stm32_defconfig
index 152321d2893e..551db328009d 100644
--- a/arch/arm/configs/stm32_defconfig
+++ b/arch/arm/configs/stm32_defconfig
@@ -14,8 +14,6 @@ CONFIG_EMBEDDED=y
# CONFIG_VM_EVENT_COUNTERS is not set
# CONFIG_SLUB_DEBUG is not set
# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
# CONFIG_MMU is not set
CONFIG_ARCH_STM32=y
CONFIG_CPU_V7M_NUM_IRQ=240