diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-09 11:39:02 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-09 11:39:02 +0200 |
| commit | d028203c0446c7f65ed2b22342a56f03c6c4a6c1 (patch) | |
| tree | 6bd73a5c70b407491dc9d40ecb9e95b48233d004 /include/asm-x86/delay.h | |
| parent | f57e91682d141ea50d8c6d42cdc251b6256a3755 (diff) | |
| parent | 183fe065652dbd64953afa9f389327e23e97967f (diff) | |
Merge branch 'x86/core' into x86/unify-pci
Diffstat (limited to 'include/asm-x86/delay.h')
| -rw-r--r-- | include/asm-x86/delay.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/asm-x86/delay.h b/include/asm-x86/delay.h index 409a649204a..bb80880c834 100644 --- a/include/asm-x86/delay.h +++ b/include/asm-x86/delay.h @@ -26,6 +26,10 @@ extern void __delay(unsigned long loops); ((n) > 20000 ? __bad_ndelay() : __const_udelay((n) * 5ul)) : \ __ndelay(n)) +#ifdef CONFIG_X86_32 void use_tsc_delay(void); +#else +#define use_tsc_delay() {} +#endif #endif /* _ASM_X86_DELAY_H */ |