diff options
| author | Tom Rini <trini@ti.com> | 2013-01-14 13:10:07 -0700 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-01-14 13:10:07 -0700 |
| commit | a6720762c88b3dac715af96f80f6a749f0c12133 (patch) | |
| tree | 183cf09c6c98613e2dfd539efe18bca4269dfe0f /include/watchdog.h | |
| parent | a17617d6553369ba72c080128ed8d0b0c33dfc89 (diff) | |
| download | talos-obmc-uboot-a6720762c88b3dac715af96f80f6a749f0c12133.tar.gz talos-obmc-uboot-a6720762c88b3dac715af96f80f6a749f0c12133.zip | |
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>
Diffstat (limited to 'include/watchdog.h')
| -rw-r--r-- | include/watchdog.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/watchdog.h b/include/watchdog.h index 328a30b9aa..8c92a0b31b 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_ */ |
