diff options
| author |   Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-04 08:11:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-04 08:11:13 -0700 |
| commit | 43d0b1376dc7abc29411fa31f50fe7cfb68afcd3 (patch) | |
| tree | 67dc7b09f7c090a3b1360a6fb06fbf9342047c5c /include/asm-sparc/delay.h | |
| parent | [PATCH] sungem: fix gfp flags type (diff) | |
| parent | [SUNSU]: Fix bogus locking in sunsu_change_mouse_baud() (diff) | |
| download | linux-dev-43d0b1376dc7abc29411fa31f50fe7cfb68afcd3.tar.xz linux-dev-43d0b1376dc7abc29411fa31f50fe7cfb68afcd3.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'include/asm-sparc/delay.h')
| -rw-r--r-- | include/asm-sparc/delay.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-sparc/delay.h b/include/asm-sparc/delay.h index 6edf2cbb246b..7ec8e9f7ad4f 100644 --- a/include/asm-sparc/delay.h +++ b/include/asm-sparc/delay.h @@ -10,7 +10,7 @@ #include <linux/config.h> #include <asm/cpudata.h> -extern __inline__ void __delay(unsigned long loops) +static inline void __delay(unsigned long loops) { __asm__ __volatile__("cmp %0, 0\n\t" "1: bne 1b\n\t" |