diff options
| author | Linus Torvalds | 2009-04-17 18:57:17 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2009-04-17 18:57:17 +0200 |
| commit | 4dc8ab86e0724642e2f778116de64f4b832d7d94 (patch) | |
| tree | ba3e1327823ac94dc5d33cb76d8704ea0ad915d7 /include/asm-m32r/delay.h | |
| parent | Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| parent | m32r: move include/asm-m32r/* to arch/m32r/include/asm/ (diff) | |
| download | kernel-qcow2-linux-4dc8ab86e0724642e2f778116de64f4b832d7d94.tar.gz kernel-qcow2-linux-4dc8ab86e0724642e2f778116de64f4b832d7d94.tar.xz kernel-qcow2-linux-4dc8ab86e0724642e2f778116de64f4b832d7d94.zip | |
Merge branch 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev
* 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev:
m32r: move include/asm-m32r/* to arch/m32r/include/asm/
m32r: move include/asm-m32r headers to arch/m32r/include/asm
Diffstat (limited to 'include/asm-m32r/delay.h')
| -rw-r--r-- | include/asm-m32r/delay.h | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/include/asm-m32r/delay.h b/include/asm-m32r/delay.h deleted file mode 100644 index 9dd9e999ea69..000000000000 --- a/include/asm-m32r/delay.h +++ /dev/null @@ -1,26 +0,0 @@ -#ifndef _ASM_M32R_DELAY_H -#define _ASM_M32R_DELAY_H - -/* - * Copyright (C) 1993 Linus Torvalds - * - * Delay routines calling functions in arch/m32r/lib/delay.c - */ - -extern void __bad_udelay(void); -extern void __bad_ndelay(void); - -extern void __udelay(unsigned long usecs); -extern void __ndelay(unsigned long nsecs); -extern void __const_udelay(unsigned long xloops); -extern void __delay(unsigned long loops); - -#define udelay(n) (__builtin_constant_p(n) ? \ - ((n) > 20000 ? __bad_udelay() : __const_udelay((n) * 0x10c7ul)) : \ - __udelay(n)) - -#define ndelay(n) (__builtin_constant_p(n) ? \ - ((n) > 20000 ? __bad_ndelay() : __const_udelay((n) * 5ul)) : \ - __ndelay(n)) - -#endif /* _ASM_M32R_DELAY_H */ |