From: Rasmus Villemoes Date: Fri, 13 Mar 2020 16:04:56 +0000 (+0100) Subject: watchdog: remove stale ifndef CONFIG_WATCHDOG_TIMEOUT_MSECS from wdt.h X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=21a0bf7f466b8e71ce5ba2c2bcf635d7ab1fc83d;p=u-boot.git watchdog: remove stale ifndef CONFIG_WATCHDOG_TIMEOUT_MSECS from wdt.h Since WATCHDOG_TIMEOUT_MSECS was converted to Kconfig (commit ca51ef7c0c), CONFIG_WATCHDOG_TIMEOUT_MSECS has been guaranteed to be defined. So remove the dead fallback ifdeffery. Signed-off-by: Rasmus Villemoes Reviewed-by: Stefan Roese --- diff --git a/include/wdt.h b/include/wdt.h index dd83dfdd32..4cbb8de8cb 100644 --- a/include/wdt.h +++ b/include/wdt.h @@ -107,9 +107,6 @@ struct wdt_ops { }; #if CONFIG_IS_ENABLED(WDT) -#ifndef CONFIG_WATCHDOG_TIMEOUT_MSECS -#define CONFIG_WATCHDOG_TIMEOUT_MSECS (60 * 1000) -#endif #define WATCHDOG_TIMEOUT_SECS (CONFIG_WATCHDOG_TIMEOUT_MSECS / 1000) static inline int initr_watchdog(void)