From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tom Rini Date: Mon, 14 Jan 2013 13:13:29 -0700 Subject: [U-Boot] [PATCH] watchdog.h: Move hw_watchdog_init prototype to end, guard In-Reply-To: <20130114175839.646a9624@lilith> References: <20130114175839.646a9624@lilith> Message-ID: <1358194409-5903-1-git-send-email-trini@ti.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de In commit abbab70 we added a prototype for hw_watchdog_init, in a Freescale i.MX watchdog driver. We did not however guard it with an __ASSEMBLY__ check and broke some platforms. Move this to the end of the file with other prototypes and guard it. Signed-off-by: Tom Rini --- include/watchdog.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/include/watchdog.h b/include/watchdog.h index 328a30b..8c92a0b 100644 --- a/include/watchdog.h +++ b/include/watchdog.h @@ -35,7 +35,6 @@ * Hardware watchdog */ #ifdef CONFIG_HW_WATCHDOG - void hw_watchdog_init(void); #if defined(__ASSEMBLY__) #define WATCHDOG_RESET bl hw_watchdog_reset #else @@ -91,4 +90,8 @@ void reset_4xx_watchdog(void); #endif +/* Freescale i.MX */ +#if defined(CONFIG_IMX_WATCHDOG) && !defined(__ASSEMBLY__) + void hw_watchdog_init(void); +#endif #endif /* _WATCHDOG_H_ */ -- 1.7.9.5