diff options
| author | Olof Johansson <olof@lixom.net> | 2015-12-22 11:47:27 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-12-22 11:47:27 -0800 |
| commit | 0b71b62802004bfef8a450060d48f8e8fcc07ed3 (patch) | |
| tree | 08c6d9a931bbd8a17cf4716b5a8cc3171bbc81e6 | |
| parent | 1c5a9b84a16420700a07956c3485f91be48799ce (diff) | |
| parent | 94c2317cf46a9c137650bf30f2aba7271886c0b4 (diff) | |
| download | linux-0b71b62802004bfef8a450060d48f8e8fcc07ed3.tar.bz2 | |
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>
| -rw-r--r-- | arch/arm/configs/sama5_defconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/configs/sama5_defconfig b/arch/arm/configs/sama5_defconfig index 63f7e6ce649a..c11bab735125 100644 --- a/arch/arm/configs/sama5_defconfig +++ b/arch/arm/configs/sama5_defconfig @@ -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 |