flash: complete CONFIG_SYS_NO_FLASH move with renaming

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

diff --git a/include/wait_bit.h b/include/wait_bit.h
index 061a2db5a2db2a30e8a92a8a9be340f73d2a801b..06ad43a122d69f5f58830ed387183e0f213d96df 100644 (file)
--- a/include/wait_bit.h
+++ b/include/wait_bit.h
@@ -11,7 +11,8 @@
 
 #include <common.h>
 #include <console.h>
-#include <asm/errno.h>
+#include <watchdog.h>
+#include <linux/errno.h>
 #include <asm/io.h>
 
 /**
@@ -59,6 +60,7 @@ static inline int wait_for_bit(const char *prefix, const u32 *reg,
                }
 
                udelay(1);
+               WATCHDOG_RESET();
        }
 
        debug("%s: Timeout (reg=%p mask=%08x wait_set=%i)\n", prefix, reg, mask,