diff options
| author | Renn Wu <rewu@nvidia.com> | 2015-03-03 10:17:27 +0800 |
|---|---|---|
| committer | Winnie Hsu <whsu@nvidia.com> | 2015-04-15 11:13:15 -0700 |
| commit | a2d5506261b58d191b01b5c677c02cebedda6436 (patch) | |
| tree | d7c00960ca34ad458d647a847cda155f9740b19e /arch/arm/configs | |
| parent | 0ab97b0540c717428f35b9421a396e1c79937b5e (diff) | |
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 <rewu@nvidia.com>
Reviewed-on: http://git-master/r/712938
Reviewed-by: Winnie Hsu <whsu@nvidia.com>
Tested-by: Winnie Hsu <whsu@nvidia.com>
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/tegra12_defconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/configs/tegra12_defconfig b/arch/arm/configs/tegra12_defconfig index 7ea0f92f0ff4..ca4ee771e28e 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 |