| commit | b43890af886b14d3052d8b7f9e0b2f8d261dcd7d | [log] [tgz] |
|---|---|---|
| author | Jesper Nilsson <jesper.nilsson@axis.com> | Mon Jan 21 16:38:41 2008 +0100 |
| committer | Jesper Nilsson <jesper.nilsson@axis.com> | Fri Feb 08 11:06:32 2008 +0100 |
| tree | 9a20e79fe685a0e8428d7c0c4431f0944313d2ca | |
| parent | 151f6398301c30670456efd0c4801aa721d557b9 [diff] |
CRIS: Allow arch dependent delay to override common version.
diff --git a/include/asm-cris/delay.h b/include/asm-cris/delay.h index d3a3978..123e19a 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) */