Commit a6720762c88b3dac715af96f80f6a749f0c12133
1 parent
a17617d655
Exists in
master
and in
54 other branches
watchdog.h: Move hw_watchdog_init prototype to end, guard
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>
Showing 1 changed file with 4 additions and 1 deletions Side-by-side Diff
include/watchdog.h
| ... | ... | @@ -35,7 +35,6 @@ |
| 35 | 35 | * Hardware watchdog |
| 36 | 36 | */ |
| 37 | 37 | #ifdef CONFIG_HW_WATCHDOG |
| 38 | - void hw_watchdog_init(void); | |
| 39 | 38 | #if defined(__ASSEMBLY__) |
| 40 | 39 | #define WATCHDOG_RESET bl hw_watchdog_reset |
| 41 | 40 | #else |
| ... | ... | @@ -91,5 +90,9 @@ |
| 91 | 90 | void reset_4xx_watchdog(void); |
| 92 | 91 | #endif |
| 93 | 92 | |
| 93 | +/* Freescale i.MX */ | |
| 94 | +#if defined(CONFIG_IMX_WATCHDOG) && !defined(__ASSEMBLY__) | |
| 95 | + void hw_watchdog_init(void); | |
| 96 | +#endif | |
| 94 | 97 | #endif /* _WATCHDOG_H_ */ |