Commit e577969a authored Jan 16, 2017 by Olof Johansson

stblinux into fixes

This pull request contains fixes to multi_v7_defconfig for Broadcom ARM-based
SoCs, please pull the following changes:

- Valenting fixes two incorrect Kconfig symbols for BCM47xx: NVRAM and watchdog drivers

* tag 'arm-soc/for-4.10/defconfig-fixes' of http://github.com/Broadcom/stblinux

:
  ARM: multi_v7_defconfig: set bcm47xx watchdog
  ARM: multi_v7_defconfig: fix config typo

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

parents 9fab907f 91546c56

arch/arm/configs/multi_v7_defconfig

+2 −2

Original line number	Diff line number	Diff line
		@@ -471,7 +471,7 @@ CONFIG_MESON_WATCHDOG=y
		CONFIG_DW_WATCHDOG=y
		CONFIG_DIGICOLOR_WATCHDOG=y
		CONFIG_BCM2835_WDT=y
		CONFIG_BCM47XX_WATCHDOG=y
		CONFIG_BCM47XX_WDT=y
		CONFIG_BCM7038_WDT=m
		CONFIG_BCM_KONA_WDT=y
		CONFIG_MFD_ACT8945A=y
		@@ -893,7 +893,7 @@ CONFIG_BCM2835_MBOX=y
		CONFIG_RASPBERRYPI_FIRMWARE=y
		CONFIG_EFI_VARS=m
		CONFIG_EFI_CAPSULE_LOADER=m
		CONFIG_CONFIG_BCM47XX_NVRAM=y
		CONFIG_BCM47XX_NVRAM=y
		CONFIG_BCM47XX_SPROM=y
		CONFIG_EXT4_FS=y
		CONFIG_AUTOFS4_FS=y