X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fwatchdog.h;h=20ac59a8b0c1a696621586f0bd4408031738e86c;hb=502589777416aaee32e4ba1682c6eb3aa3a88e1c;hp=bd0a8d6b19fdef0a9d9467f1a25747ca02976cc1;hpb=336450f5fc1c0d6eb0d95c536dadf0cc07466a4d;p=u-boot

diff --git a/include/watchdog.h b/include/watchdog.h
index bd0a8d6b19..20ac59a8b0 100644
--- a/include/watchdog.h
+++ b/include/watchdog.h
@@ -21,7 +21,7 @@
 int init_func_watchdog_reset(void);
 #endif
 
-#ifdef CONFIG_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
@@ -72,16 +72,6 @@ int init_func_watchdog_reset(void);
  * Prototypes from $(CPU)/cpu.c.
  */
 
-/* MPC 8xx */
-#if (defined(CONFIG_8xx) || defined(CONFIG_MPC860)) && !defined(__ASSEMBLY__)
-	void reset_8xx_watchdog(volatile immap_t *immr);
-#endif
-
-/* MPC 5xx */
-#if defined(CONFIG_5xx) && !defined(__ASSEMBLY__)
-	void reset_5xx_watchdog(volatile immap_t *immr);
-#endif
-
 /* MPC 5xxx */
 #if defined(CONFIG_MPC5xxx) && !defined(__ASSEMBLY__)
 	void reset_5xxx_watchdog(void);