From 9be2e790eb28cbb30fb16a939cb95f82ad73efe5 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sat, 14 May 2016 18:49:35 -0600 Subject: Drop use of CONFIG_SYS_GENERIC_BOARD in U-Boot MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This option is always enabled and is about to be removed. Drop references to it. Signed-off-by: Simon Glass Reviewed-by: Andreas Bießmann --- include/watchdog.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'include') diff --git a/include/watchdog.h b/include/watchdog.h index 9273fa1e80..174c894e49 100644 --- a/include/watchdog.h +++ b/include/watchdog.h @@ -21,8 +21,7 @@ int init_func_watchdog_reset(void); #endif -#if defined(CONFIG_SYS_GENERIC_BOARD) && \ - (defined(CONFIG_WATCHDOG) || defined(CONFIG_HW_WATCHDOG)) +#if defined(CONFIG_WATCHDOG) || defined(CONFIG_HW_WATCHDOG) #define INIT_FUNC_WATCHDOG_INIT init_func_watchdog_init, #define INIT_FUNC_WATCHDOG_RESET init_func_watchdog_reset, #else -- cgit