Merge branch 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev

[pandora-kernel.git] / include / asm-cris / delay.h

diff --git a/include/asm-cris/delay.h b/include/asm-cris/delay.h
index d3a3978..123e19a 100644 (file)
--- 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) */