diff options
author | Sam Ravnborg <sam@ravnborg.org> | 2008-07-27 17:00:59 -0400 |
---|---|---|
committer | Sam Ravnborg <sam@ravnborg.org> | 2008-07-27 17:00:59 -0400 |
commit | a439fe51a1f8eb087c22dd24d69cebae4a3addac (patch) | |
tree | e32d1fa97a220ab598d8ab364205817c5bf2bd6f /arch/sparc/include/asm/delay_64.h | |
parent | 837b41b5de356aa67abb2cadb5eef3efc7776f91 (diff) |
sparc, sparc64: use arch/sparc/include
The majority of this patch was created by the following script:
***
ASM=arch/sparc/include/asm
mkdir -p $ASM
git mv include/asm-sparc64/ftrace.h $ASM
git rm include/asm-sparc64/*
git mv include/asm-sparc/* $ASM
sed -ie 's/asm-sparc64/asm/g' $ASM/*
sed -ie 's/asm-sparc/asm/g' $ASM/*
***
The rest was an update of the top-level Makefile to use sparc
for header files when sparc64 is being build.
And a small fixlet to pick up the correct unistd.h from
sparc64 code.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Diffstat (limited to 'arch/sparc/include/asm/delay_64.h')
-rw-r--r-- | arch/sparc/include/asm/delay_64.h | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/arch/sparc/include/asm/delay_64.h b/arch/sparc/include/asm/delay_64.h new file mode 100644 index 000000000000..a77aa622d762 --- /dev/null +++ b/arch/sparc/include/asm/delay_64.h | |||
@@ -0,0 +1,17 @@ | |||
1 | /* delay.h: Linux delay routines on sparc64. | ||
2 | * | ||
3 | * Copyright (C) 1996, 2004, 2007 David S. Miller (davem@davemloft.net). | ||
4 | */ | ||
5 | |||
6 | #ifndef _SPARC64_DELAY_H | ||
7 | #define _SPARC64_DELAY_H | ||
8 | |||
9 | #ifndef __ASSEMBLY__ | ||
10 | |||
11 | extern void __delay(unsigned long loops); | ||
12 | extern void udelay(unsigned long usecs); | ||
13 | #define mdelay(n) udelay((n) * 1000) | ||
14 | |||
15 | #endif /* !__ASSEMBLY__ */ | ||
16 | |||
17 | #endif /* _SPARC64_DELAY_H */ | ||