diff options
author | Paul Mundt <lethal@linux-sh.org> | 2008-03-06 03:23:15 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2008-03-06 03:23:15 -0500 |
commit | 7b9726a7a0d8c70ea44a5ed23726748de344f223 (patch) | |
tree | a9c96bf0e1e084981e4bd8e14c6c8505f0780dbb /include/asm-sh | |
parent | e7d7deca60c01d844a4d8e5644f4aecaf0e3bee4 (diff) |
sh: Fix up the sh64 build.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'include/asm-sh')
-rw-r--r-- | include/asm-sh/delay.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/asm-sh/delay.h b/include/asm-sh/delay.h index d5d464041003..4b16bf9b56bd 100644 --- a/include/asm-sh/delay.h +++ b/include/asm-sh/delay.h | |||
@@ -15,7 +15,6 @@ extern void __ndelay(unsigned long nsecs); | |||
15 | extern void __const_udelay(unsigned long xloops); | 15 | extern void __const_udelay(unsigned long xloops); |
16 | extern void __delay(unsigned long loops); | 16 | extern void __delay(unsigned long loops); |
17 | 17 | ||
18 | #ifdef CONFIG_SUPERH32 | ||
19 | #define udelay(n) (__builtin_constant_p(n) ? \ | 18 | #define udelay(n) (__builtin_constant_p(n) ? \ |
20 | ((n) > 20000 ? __bad_udelay() : __const_udelay((n) * 0x10c6ul)) : \ | 19 | ((n) > 20000 ? __bad_udelay() : __const_udelay((n) * 0x10c6ul)) : \ |
21 | __udelay(n)) | 20 | __udelay(n)) |
@@ -23,9 +22,5 @@ extern void __delay(unsigned long loops); | |||
23 | #define ndelay(n) (__builtin_constant_p(n) ? \ | 22 | #define ndelay(n) (__builtin_constant_p(n) ? \ |
24 | ((n) > 20000 ? __bad_ndelay() : __const_udelay((n) * 5ul)) : \ | 23 | ((n) > 20000 ? __bad_ndelay() : __const_udelay((n) * 5ul)) : \ |
25 | __ndelay(n)) | 24 | __ndelay(n)) |
26 | #else | ||
27 | extern void udelay(unsigned long usecs); | ||
28 | extern void ndelay(unsigned long nsecs); | ||
29 | #endif | ||
30 | 25 | ||
31 | #endif /* __ASM_SH_DELAY_H */ | 26 | #endif /* __ASM_SH_DELAY_H */ |