remove "static" from "ide_dev_desc" to use it from external code

[u-boot] / include / watchdog.h

diff --git a/include/watchdog.h b/include/watchdog.h
index b9ae916a1d2835b8f5b552726f0dfb057779b109..ac6ba8c09147365b666a2684e5bbba851946367e 100644 (file)
--- a/include/watchdog.h
+++ b/include/watchdog.h
@@ -31,6 +31,10 @@
 #  error "Configuration error: CONFIG_HW_WATCHDOG and CONFIG_WATCHDOG can't be used together."
 #endif
 
+#if defined(__ASSEMBLY__) && defined(__NIOS__)
+#  error "Configuration error: WATCHDOG_RESET inside assembler not supported for Nios platforms."
+#endif
+
 /*
  * Hardware watchdog
  */
@@ -85,16 +89,4 @@
        void reset_4xx_watchdog(void);
 #endif
 
-/* MPC 8260 */
-#if defined(CONFIG_MPC8260) && !defined(__ASSEMBLY__)
-#if defined(CONFIG_WATCHDOG)
-extern __inline__ void
-reset_8260_watchdog(volatile immap_t *immr)
-{
-       immr->im_siu_conf.sc_swsr = 0x556c;
-       immr->im_siu_conf.sc_swsr = 0xaa39;
-}
-#endif /* !__ASSEMBLY__ && CONFIG_WATCHDOG */
-#endif /* CONFIG_MPC8260 && !__ASSEMBLY__ */
-
 #endif /* _WATCHDOG_H_ */