Merge tag 'stm32-defconfig-for-v4.13-1' of...

Merge tag 'stm32-defconfig-for-v4.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32 into next/defconfig

STM32 defconfig updates for v4.13, round 1

Highlights:
----------
 - Enable STMPE1600 IO expander
 - Enable Watchdog support

* tag 'stm32-defconfig-for-v4.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32:
  ARM: configs: stm32: STMPE1600 GPIO expander
  ARM: configs: stm32: Add watchdog support in STM32 defconfig
Signed-off-by: Olof Johansson <olof@lixom.net>

arch/arm/configs/stm32_defconfig

@@ -52,7 +52,10 @@ CONFIG_I2C=y
 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_STM32F4=y
 # CONFIG_HWMON is not set
+CONFIG_WATCHDOG=y
 CONFIG_REGULATOR=y
+CONFIG_GPIO_STMPE=y
+CONFIG_MFD_STMPE=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
 # CONFIG_USB_SUPPORT is not set
 CONFIG_NEW_LEDS=y