X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Fasm-cris%2Fdelay.h;h=123e19aef49d9cd0644b14be6270698852f23e4d;hb=d9ecdb282c91952796b7542c4f57fd6de6948d7b;hp=d3a39780371993eabf5503b63ffe4432256f35fb;hpb=333c47c847c90aaefde8b593054d9344106333b5;p=linux-2.6

diff --git a/include/asm-cris/delay.h b/include/asm-cris/delay.h
index d3a3978037..123e19aef4 100644
--- a/include/asm-cris/delay.h
+++ b/include/asm-cris/delay.h
@@ -13,10 +13,13 @@
 
 extern unsigned long loops_per_usec; /* arch/cris/mm/init.c */
 
+/* May be defined by arch/delay.h. */
+#ifndef udelay
 static inline void udelay(unsigned long usecs)
 {
 	__delay(usecs * loops_per_usec);
 }
+#endif
 
 #endif /* defined(_CRIS_DELAY_H) */