Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752454AbcDZQPW (ORCPT ); Tue, 26 Apr 2016 12:15:22 -0400 Received: from eusmtp01.atmel.com ([212.144.249.243]:45955 "EHLO eusmtp01.atmel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751890AbcDZQPU (ORCPT ); Tue, 26 Apr 2016 12:15:20 -0400 From: Nicolas Ferre To: Alexandre Belloni , CC: , Jean-Christophe PLAGNIOL-VILLARD , Boris BREZILLON , Ludovic Desroches , Nicolas Ferre Subject: [PATCH 1/4] ARM: multi_v7_defconfig: add Atmel watchdog timers Date: Tue, 26 Apr 2016 18:15:44 +0200 Message-ID: X-Mailer: git-send-email 2.1.3 In-Reply-To: <1459347577-15450-1-git-send-email-boris.brezillon@free-electrons.com> References: <1459347577-15450-1-git-send-email-boris.brezillon@free-electrons.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 746 Lines: 23 Add both Atmel watchdog timers to the multi_v7_defconfig. They are added as part of the kernel because it's a core piece of the system. Signed-off-by: Nicolas Ferre --- arch/arm/configs/multi_v7_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index af1e0c91a6f2..d72ee27cecae 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -430,6 +430,8 @@ CONFIG_WATCHDOG=y CONFIG_DA9063_WATCHDOG=m CONFIG_XILINX_WATCHDOG=y CONFIG_ARM_SP805_WATCHDOG=y +CONFIG_AT91SAM9X_WATCHDOG=y +CONFIG_SAMA5D4_WATCHDOG=y CONFIG_ORION_WATCHDOG=y CONFIG_ST_LPC_WATCHDOG=y CONFIG_SUNXI_WATCHDOG=y -- 2.1.3