diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-05 20:38:55 +0100 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-05 20:38:55 +0100 |
commit | 328198acb7407301ddf6005c0fa1e04bd0c539c8 (patch) | |
tree | 9936112bd195bfbaacc9a75f2ea7ff757a2c0546 /include/asm-m68knommu/delay.h | |
parent | Merge branch 'master' (diff) | |
parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6 (diff) | |
download | linux-328198acb7407301ddf6005c0fa1e04bd0c539c8.tar.xz linux-328198acb7407301ddf6005c0fa1e04bd0c539c8.zip |
Merge branch 'master'
Diffstat (limited to 'include/asm-m68knommu/delay.h')
-rw-r--r-- | include/asm-m68knommu/delay.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-m68knommu/delay.h b/include/asm-m68knommu/delay.h index e3a976254672..04a20fd051cf 100644 --- a/include/asm-m68knommu/delay.h +++ b/include/asm-m68knommu/delay.h @@ -8,7 +8,7 @@ #include <asm/param.h> -extern __inline__ void __delay(unsigned long loops) +static inline void __delay(unsigned long loops) { #if defined(CONFIG_COLDFIRE) /* The coldfire runs this loop at significantly different speeds @@ -48,7 +48,7 @@ extern __inline__ void __delay(unsigned long loops) extern unsigned long loops_per_jiffy; -extern __inline__ void _udelay(unsigned long usecs) +static inline void _udelay(unsigned long usecs) { #if defined(CONFIG_M68328) || defined(CONFIG_M68EZ328) || \ defined(CONFIG_M68VZ328) || defined(CONFIG_M68360) || \ |