From: Jesper Nilsson Date: Mon, 21 Jan 2008 15:38:41 +0000 (+0100) Subject: CRIS: Allow arch dependent delay to override common version. X-Git-Tag: v2.6.25-rc1~40^2~76 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b43890af886b14d3052d8b7f9e0b2f8d261dcd7d;p=linux-2.6-omap-h63xx.git CRIS: Allow arch dependent delay to override common version. --- diff --git a/include/asm-cris/delay.h b/include/asm-cris/delay.h index d3a39780371..123e19aef49 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) */