---

yaml --- r: 84988 b: refs/heads/master c: b43890a h: refs/heads/master v: v3
git-mirror · Feb 8, 2008 · cde964a · cde964a
1 parent 0200a6e
commit cde964a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 151f6398301c30670456efd0c4801aa721d557b9
+refs/heads/master: b43890af886b14d3052d8b7f9e0b2f8d261dcd7d
diff --git a/trunk/include/asm-cris/delay.h b/trunk/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) */