diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
| commit | 24bfb00123e82a2e70bd115277d922438813515b (patch) | |
| tree | 27328b8a5718e16d64e2d101f4b7ddcad5930aed /include/asm-cris/delay.h | |
| parent | c6135234550ed89a6fd0e8cb229633967e41d649 (diff) | |
| parent | 3f00d3e8fb963968a922d821a9a53b503b687e81 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'include/asm-cris/delay.h')
| -rw-r--r-- | include/asm-cris/delay.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-cris/delay.h b/include/asm-cris/delay.h index efc41aad4845..d3a397803719 100644 --- a/include/asm-cris/delay.h +++ b/include/asm-cris/delay.h | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | 13 | ||
| 14 | extern unsigned long loops_per_usec; /* arch/cris/mm/init.c */ | 14 | extern unsigned long loops_per_usec; /* arch/cris/mm/init.c */ |
| 15 | 15 | ||
| 16 | extern __inline__ void udelay(unsigned long usecs) | 16 | static inline void udelay(unsigned long usecs) |
| 17 | { | 17 | { |
| 18 | __delay(usecs * loops_per_usec); | 18 | __delay(usecs * loops_per_usec); |
| 19 | } | 19 | } |