Merge samsung, imx, tegra into u-boot-arm/master

[karo-tx-uboot.git] / include / watchdog.h

diff --git a/include/watchdog.h b/include/watchdog.h
index ef2f5aac9bef0820ca037e4dbd83511672c3af49..b9599143afdb4cb701eb98d3f57d3971d9129f30 100644 (file)
--- a/include/watchdog.h
+++ b/include/watchdog.h
@@ -31,10 +31,6 @@
 #  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
  */