Merge branch '070524_netstar' of git://linux-arm.org/u-boot-armdev

[oweals/u-boot.git] / include / watchdog.h

diff --git a/include/watchdog.h b/include/watchdog.h
index 7180259d05445db5e08a77493194b7c4778226d0..9265be9737245d7a1e8468c398aef12d07945bad 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
  */
@@ -80,7 +84,7 @@
        void reset_5xx_watchdog(volatile immap_t *immr);
 #endif
 
-/* IBM 4xx */
+/* AMCC 4xx */
 #if defined(CONFIG_4xx) && !defined(__ASSEMBLY__)
        void reset_4xx_watchdog(void);
 #endif