diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-09-22 13:08:57 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-09-22 13:08:57 +0200 |
commit | 0b88641f1bafdbd087d5e63987a30cc0eadd63b9 (patch) | |
tree | 81dcf756db373444140bb2623584710c628e3048 /include/asm-sparc/delay_64.h | |
parent | fbdbf709938d155c719c76b9894d28342632c797 (diff) | |
parent | 72d31053f62c4bc464c2783974926969614a8649 (diff) | |
download | linux-0b88641f1bafdbd087d5e63987a30cc0eadd63b9.tar.gz linux-0b88641f1bafdbd087d5e63987a30cc0eadd63b9.tar.bz2 linux-0b88641f1bafdbd087d5e63987a30cc0eadd63b9.zip |
Merge commit 'v2.6.27-rc7' into x86/debug
Diffstat (limited to 'include/asm-sparc/delay_64.h')
-rw-r--r-- | include/asm-sparc/delay_64.h | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/include/asm-sparc/delay_64.h b/include/asm-sparc/delay_64.h deleted file mode 100644 index a77aa622d762..000000000000 --- a/include/asm-sparc/delay_64.h +++ /dev/null @@ -1,17 +0,0 @@ -/* delay.h: Linux delay routines on sparc64. - * - * Copyright (C) 1996, 2004, 2007 David S. Miller (davem@davemloft.net). - */ - -#ifndef _SPARC64_DELAY_H -#define _SPARC64_DELAY_H - -#ifndef __ASSEMBLY__ - -extern void __delay(unsigned long loops); -extern void udelay(unsigned long usecs); -#define mdelay(n) udelay((n) * 1000) - -#endif /* !__ASSEMBLY__ */ - -#endif /* _SPARC64_DELAY_H */ |