diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-20 09:02:39 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-20 09:02:39 +0100 |
| commit | fbc2a06056c9aa3cb8c44bf1cfeb1d260e229e5c (patch) | |
| tree | feb2a1c13ad3dff5a8c7ab3c0265e8eca7a0c5a3 /include/asm-cris/delay.h | |
| parent | a3d732f93785da17e0137210deadb4616f5536fc (diff) | |
| parent | ee2f6cc7f9ea2542ad46070ed62ba7aa04d08871 (diff) | |
Merge branch 'linus' into x86/uv
Diffstat (limited to 'include/asm-cris/delay.h')
| -rw-r--r-- | include/asm-cris/delay.h | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/include/asm-cris/delay.h b/include/asm-cris/delay.h deleted file mode 100644 index 123e19aef49..00000000000 --- a/include/asm-cris/delay.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef _CRIS_DELAY_H -#define _CRIS_DELAY_H - -/* - * Copyright (C) 1998-2002 Axis Communications AB - * - * Delay routines, using a pre-computed "loops_per_second" value. - */ - -#include <asm/arch/delay.h> - -/* Use only for very small delays ( < 1 msec). */ - -extern unsigned long loops_per_usec; /* arch/cris/mm/init.c */ - -/* May be defined by arch/delay.h. */ -#ifndef udelay -static inline void udelay(unsigned long usecs) -{ - __delay(usecs * loops_per_usec); -} -#endif - -#endif /* defined(_CRIS_DELAY_H) */ - - - |