minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-07 02:47:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

watchdog.h: Move hw_watchdog_init prototype to end, guard

Browse Source 
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 <trini@ti.com>
This commit is contained in:
Tom Rini 2013-01-14 13:10:07 -07:00
parent a17617d655
commit a6720762c8
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/watchdog.h
View File

@ -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_ */