simple-bus: remove DECLARE_GLOBAL_DATA_PTR

[people/ms/u-boot.git] / include / watchdog.h

diff --git a/include/watchdog.h b/include/watchdog.h
index aacacb970a1bab2f03f5b6731811bf0379a9fa42..64b59f107ade3261741cfb72e71d7b3604c4bea4 100644 (file)
--- 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
@@ -73,26 +73,15 @@ int init_func_watchdog_reset(void);
  */
 
 /* 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);
-#endif
-
-/* AMCC 4xx */
-#if defined(CONFIG_4xx) && !defined(__ASSEMBLY__)
-       void reset_4xx_watchdog(void);
+#if defined(CONFIG_8xx) && !defined(__ASSEMBLY__)
+       void reset_8xx_watchdog(immap_t __iomem *immr);
 #endif
 
 #if defined(CONFIG_HW_WATCHDOG) && !defined(__ASSEMBLY__)
        void hw_watchdog_init(void);
 #endif
+
+#if defined(CONFIG_MPC85xx) && !defined(__ASSEMBLY__)
+       void init_85xx_watchdog(void);
+#endif
 #endif /* _WATCHDOG_H_ */