From 028ab6b598b628326116acd88e0f35aa9f526d12 Mon Sep 17 00:00:00 2001
From: wdenk <wdenk>
Date: Mon, 23 Feb 2004 23:54:43 +0000
Subject: * Patch by Peter Ryser, 20 Feb 2004:   Add support for the Xilinx
 ML300 platform

* Patch by Stephan Linz, 17 Feb 2004:
  Fix watchdog support for NIOS

* Patch by Josh Fryman, 16 Feb 2004:
  Fix byte-swapping for cfi_flash.c for different bus widths

* Patch by Jon Diekema, 14 Jeb 2004:
  Remove duplicate "FPGA Support" notes from the README file
---
 include/watchdog.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'include/watchdog.h')

diff --git a/include/watchdog.h b/include/watchdog.h
index 7180259d0..ac6ba8c09 100644
--- 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
  */
-- 
cgit v1.2.3