First defconfig pull-request for 4.5:

- a single patch to add watchdog drivers to sama5_defconfig
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQEcBAABAgAGBQJWcTppAAoJEAf03oE53VmQ5gcH/252ZvQZghdwzRBOGrmabRGt
 9llUe/bGnd6ah582VjYtEHk27815+7qyFWQfLs501n/5/RYAIRIzdin/QrjdUbh1
 hHr881ym5MgPYAwFEZ9yK1GVGyM3QUybVXFDPromBw9fvfVCcqOn/U/4gRCdNlQw
 90j167bhkCWO4uhdZ6yoS6Apv/cs4BF/g6sVXmXuJkck98w8e+wHXZ3LzUC9jP97
 RkmZU3YVbRH0/WYzjx8ymjyyqyJUDtU+jAkeDT6Gnjs1tfrM0irXXkRv3zrB6LJG
 dPmXK9w6rjF+X/hqo4ojKzuZrxyA1qD9CHVOBalgXYXETlhrl+YBRNWOC/yk7g4=
 =s+Hb
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Olof Johansson 2015-12-22 11:47:27 -08:00
commit 0b71b62802

View file

@ -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