diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-06 19:32:33 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-06 19:32:33 -0800 |
| commit | ce4796d1e16cf3761dc2a02b8d588667d05b3078 (patch) | |
| tree | 823d7012c6311c96eaf2041cf2b04558abbaec15 /include | |
| parent | 46fbdf8935544dcde440bd807b50e52ed2ca7f3b (diff) | |
| parent | 7b9726a7a0d8c70ea44a5ed23726748de344f223 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.25
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.25:
sh: Fix up the sh64 build.
sh: Fix up SH7710 VoIP-GW build.
sh: Flag PMB support as EXPERIMENTAL.
sh: Update r7780mp defconfig.
fb: hitfb: Balance probe/remove section annotations.
sh: hp6xx: Fix up hp6xx_apm build failure.
fb: pvr2fb: Fix up remaining section mismatch.
sh: Fix up section mismatches.
sh: hp6xx: Correct APM output.
sh: update se7780 defconfig
sh: replace remaining __FUNCTION__ occurrences
sh: export copy-page() to modules
sh_ksyms_32.c update for gcc 4.3
sh/mm/pg-sh7705.c must #include <linux/fs.h>
Diffstat (limited to 'include')
| -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 d5d46404100..4b16bf9b56b 100644 --- a/include/asm-sh/delay.h +++ b/include/asm-sh/delay.h @@ -15,7 +15,6 @@ extern void __ndelay(unsigned long nsecs); extern void __const_udelay(unsigned long xloops); extern void __delay(unsigned long loops); -#ifdef CONFIG_SUPERH32 #define udelay(n) (__builtin_constant_p(n) ? \ ((n) > 20000 ? __bad_udelay() : __const_udelay((n) * 0x10c6ul)) : \ __udelay(n)) @@ -23,9 +22,5 @@ extern void __delay(unsigned long loops); #define ndelay(n) (__builtin_constant_p(n) ? \ ((n) > 20000 ? __bad_ndelay() : __const_udelay((n) * 5ul)) : \ __ndelay(n)) -#else -extern void udelay(unsigned long usecs); -extern void ndelay(unsigned long nsecs); -#endif #endif /* __ASM_SH_DELAY_H */ |