diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2008-09-04 11:08:42 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2008-09-04 11:08:42 -0400 |
| commit | 7203781c98ad9147564d327de6f6513ad8fc0f4e (patch) | |
| tree | 5c29a2a04a626bf08a0d56fd8a0068b3c92ad284 /include/asm-alpha/delay.h | |
| parent | 671eef85a3e885dff4ce210d8774ad50a91d5967 (diff) | |
| parent | af2e1f276ff08f17192411ea3b71c13a758dfe12 (diff) | |
Merge branch 'x86/cpu' into x86/core
Conflicts:
arch/x86/kernel/cpu/feature_names.c
include/asm-x86/cpufeature.h
Diffstat (limited to 'include/asm-alpha/delay.h')
| -rw-r--r-- | include/asm-alpha/delay.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/include/asm-alpha/delay.h b/include/asm-alpha/delay.h deleted file mode 100644 index 2aa3f410f7e6..000000000000 --- a/include/asm-alpha/delay.h +++ /dev/null | |||
| @@ -1,10 +0,0 @@ | |||
| 1 | #ifndef __ALPHA_DELAY_H | ||
| 2 | #define __ALPHA_DELAY_H | ||
| 3 | |||
| 4 | extern void __delay(int loops); | ||
| 5 | extern void udelay(unsigned long usecs); | ||
| 6 | |||
| 7 | extern void ndelay(unsigned long nsecs); | ||
| 8 | #define ndelay ndelay | ||
| 9 | |||
| 10 | #endif /* defined(__ALPHA_DELAY_H) */ | ||