From a2d5506261b58d191b01b5c677c02cebedda6436 Mon Sep 17 00:00:00 2001 From: Renn Wu Date: Tue, 3 Mar 2015 10:17:27 +0800 Subject: [PATCH] config: fix config conflict for wdt Fix config conflict for watchdog. Tegra watchdog is disabled by default. Users can access /dev/watchdog0 to operate it. Bug 1557390 Change-Id: Ia1bb6c91dfbea85375d84bef10a10209b2fcef9f Signed-off-by: Renn Wu Reviewed-on: http://git-master/r/712938 Reviewed-by: Winnie Hsu Tested-by: Winnie Hsu --- arch/arm/configs/tegra12_defconfig | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/arm/configs/tegra12_defconfig b/arch/arm/configs/tegra12_defconfig index 7ea0f92f0ff..ca4ee771e28 100644 --- a/arch/arm/configs/tegra12_defconfig +++ b/arch/arm/configs/tegra12_defconfig @@ -572,7 +572,5 @@ CONFIG_CRYPTO_DEV_TEGRA_SE=y # CONFIG_FIQ_DEBUGGER_WAKEUP_IRQ_ALWAYS_ON is not set # CONFIG_FIQ_DEBUGGER_CONSOLE is not set # CONFIG_FIQ_DEBUGGER_CONSOLE_DEFAULT_ENABLE is not set -# CONFIG_TEGRA_WATCHDOG is not set -# CONFIG_TEGRA_WATCHDOG_ENABLE_ON_PROBE is not set # CONFIG_CONSOLE_POLL is not set -- 2.39.2