diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-09 01:07:12 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-09 01:07:12 -0500 |
commit | a892acacd3a8546ac161526522f13b5174f2c471 (patch) | |
tree | ee6d36f27f1388989ebfcabf90253fb7194112ac /include/asm-cris/arch-v32/delay.h | |
parent | 193515d51ccb363165d6b09e9ba5c21089e34bad (diff) | |
parent | 330d57fb98a916fa8e1363846540dd420e99499a (diff) | |
download | op-kernel-dev-a892acacd3a8546ac161526522f13b5174f2c471.zip op-kernel-dev-a892acacd3a8546ac161526522f13b5174f2c471.tar.gz |
Merge branch 'master'
Diffstat (limited to 'include/asm-cris/arch-v32/delay.h')
-rw-r--r-- | include/asm-cris/arch-v32/delay.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-cris/arch-v32/delay.h b/include/asm-cris/arch-v32/delay.h index f36f7f7..b6e941e 100644 --- a/include/asm-cris/arch-v32/delay.h +++ b/include/asm-cris/arch-v32/delay.h @@ -1,7 +1,7 @@ #ifndef _ASM_CRIS_ARCH_DELAY_H #define _ASM_CRIS_ARCH_DELAY_H -extern __inline__ void +static inline void __delay(int loops) { __asm__ __volatile__ ( |