Commit 0b71b628 authored Dec 22, 2015 by Olof Johansson

Merge tag 'at91-defconfig' of...

Merge tag 'at91-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/defconfig

First defconfig pull-request for 4.5:
- a single patch to add watchdog drivers to sama5_defconfig

* tag 'at91-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91

:
  ARM: at91/defconfig: enable watchdog drivers in sama5_defconfig

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

parents 1c5a9b84 94c2317c

arch/arm/configs/sama5_defconfig

+3 −0

Original line number	Diff line number	Diff line
		@@ -129,6 +129,9 @@ CONFIG_GPIO_SYSFS=y
		CONFIG_POWER_SUPPLY=y
		CONFIG_POWER_RESET=y
		# CONFIG_HWMON is not set
		CONFIG_WATCHDOG=y
		CONFIG_AT91SAM9X_WATCHDOG=y
		CONFIG_SAMA5D4_WATCHDOG=y
		CONFIG_MFD_ATMEL_FLEXCOM=y
		CONFIG_REGULATOR=y
		CONFIG_REGULATOR_FIXED_VOLTAGE=y