diff options
| author | Jesper Nilsson <jesper.nilsson@axis.com> | 2008-10-21 17:45:58 +0200 |
|---|---|---|
| committer | Jesper Nilsson <jesper.nilsson@axis.com> | 2008-10-29 17:29:44 +0100 |
| commit | 556dcee7b829e5c350c3ffdbdb87a8b15aa3c5d3 (patch) | |
| tree | 26485b0d92eedcba6c0c96d4069469041aaf7106 /include/asm-cris/arch-v32/delay.h | |
| parent | Merge branch 'for-next' of git://www.jni.nu/cris into cris_merge (diff) | |
| download | linux-556dcee7b829e5c350c3ffdbdb87a8b15aa3c5d3.tar.xz linux-556dcee7b829e5c350c3ffdbdb87a8b15aa3c5d3.zip | |
[CRIS] Move header files from include to arch/cris/include.
Change all users of header files to correct path.
Remove some unneeded headers for arch-v32.
Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
Diffstat (limited to 'include/asm-cris/arch-v32/delay.h')
| -rw-r--r-- | include/asm-cris/arch-v32/delay.h | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/include/asm-cris/arch-v32/delay.h b/include/asm-cris/arch-v32/delay.h deleted file mode 100644 index e9fda03810a9..000000000000 --- a/include/asm-cris/arch-v32/delay.h +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef _ASM_CRIS_ARCH_DELAY_H -#define _ASM_CRIS_ARCH_DELAY_H - -extern void cris_delay10ns(u32 n10ns); -#define udelay(u) cris_delay10ns((u)*100) -#define ndelay(n) cris_delay10ns(((n)+9)/10) - -/* - * Not used anymore for udelay or ndelay. Referenced by - * e.g. init/calibrate.c. All other references are likely bugs; - * should be replaced by mdelay, udelay or ndelay. - */ - -static inline void -__delay(int loops) -{ - __asm__ __volatile__ ( - "move.d %0, $r9\n\t" - "beq 2f\n\t" - "subq 1, $r9\n\t" - "1:\n\t" - "bne 1b\n\t" - "subq 1, $r9\n" - "2:" - : : "g" (loops) : "r9"); -} - -#endif /* _ASM_CRIS_ARCH_DELAY_H */ |