diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-26 04:25:59 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-26 04:25:59 -0400 |
| commit | 3cf430b0636045dc524759a0852293ba037732a7 (patch) | |
| tree | 2c4e03f9028dc23ab4e6ca5a3a5a263af397984f /arch/alpha/include/asm/delay.h | |
| parent | 93dcf55f828b035fc93fc19eb03c1390e1e6d570 (diff) | |
| parent | 83097aca8567a0bd593534853b71fe0fa9a75d69 (diff) | |
Merge branch 'linus' into sched/devel
Diffstat (limited to 'arch/alpha/include/asm/delay.h')
| -rw-r--r-- | arch/alpha/include/asm/delay.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/alpha/include/asm/delay.h b/arch/alpha/include/asm/delay.h new file mode 100644 index 000000000000..2aa3f410f7e6 --- /dev/null +++ b/arch/alpha/include/asm/delay.h | |||
| @@ -0,0 +1,10 @@ | |||
| 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) */ | ||