diff options
| author | Dave Jones <davej@redhat.com> | 2006-12-12 17:41:41 -0500 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-12-12 17:41:41 -0500 |
| commit | c4366889dda8110247be59ca41fddb82951a8c26 (patch) | |
| tree | 705c1a996bed8fd48ce94ff33ec9fd00f9b94875 /include/asm-h8300/delay.h | |
| parent | db2fb9db5735cc532fd4fc55e94b9a3c3750378e (diff) | |
| parent | e1036502e5263851259d147771226161e5ccc85a (diff) | |
Merge ../linus
Conflicts:
drivers/cpufreq/cpufreq.c
Diffstat (limited to 'include/asm-h8300/delay.h')
| -rw-r--r-- | include/asm-h8300/delay.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-h8300/delay.h b/include/asm-h8300/delay.h index cbccbbdd640f..743beba70f82 100644 --- a/include/asm-h8300/delay.h +++ b/include/asm-h8300/delay.h | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | * Delay routines, using a pre-computed "loops_per_second" value. | 9 | * Delay routines, using a pre-computed "loops_per_second" value. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | extern __inline__ void __delay(unsigned long loops) | 12 | static inline void __delay(unsigned long loops) |
| 13 | { | 13 | { |
| 14 | __asm__ __volatile__ ("1:\n\t" | 14 | __asm__ __volatile__ ("1:\n\t" |
| 15 | "dec.l #1,%0\n\t" | 15 | "dec.l #1,%0\n\t" |
| @@ -27,7 +27,7 @@ extern __inline__ void __delay(unsigned long loops) | |||
| 27 | 27 | ||
| 28 | extern unsigned long loops_per_jiffy; | 28 | extern unsigned long loops_per_jiffy; |
| 29 | 29 | ||
| 30 | extern __inline__ void udelay(unsigned long usecs) | 30 | static inline void udelay(unsigned long usecs) |
| 31 | { | 31 | { |
| 32 | usecs *= 4295; /* 2**32 / 1000000 */ | 32 | usecs *= 4295; /* 2**32 / 1000000 */ |
| 33 | usecs /= (loops_per_jiffy*HZ); | 33 | usecs /= (loops_per_jiffy*HZ); |