Commit 46dc7f5a authored Nov 17, 2016 by Olof Johansson

Merge branch 'sti-defconfig-for-4.10-round2' of...

Merge branch 'sti-defconfig-for-4.10-round2' of git://git.kernel.org/pub/scm/linux/kernel/git/pchotard/sti into next/defconfig

* 'sti-defconfig-for-4.10-round2' of git://git.kernel.org/pub/scm/linux/kernel/git/pchotard/sti

:
  ARM: multi_v7_defconfig: Remove ST_THERMAL_SYSCFG Kconfig symbol

Signed-off-by: Olof Johansson <olof@lixom.net>

parents 8f871da0 57dae748

arch/arm/configs/multi_v7_defconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -450,7 +450,6 @@ CONFIG_RCAR_THERMAL=y
		CONFIG_ARMADA_THERMAL=y
		CONFIG_DAVINCI_WATCHDOG=m
		CONFIG_EXYNOS_THERMAL=m
		CONFIG_ST_THERMAL_SYSCFG=y
		CONFIG_ST_THERMAL_MEMMAP=y
		CONFIG_WATCHDOG=y
		CONFIG_DA9063_WATCHDOG=m