diff options
| author |   Sam Ravnborg <sam@ravnborg.org> | 2008-07-27 23:00:59 +0200 |
|---|---|---|
| committer | Sam Ravnborg <sam@ravnborg.org> | 2008-07-27 23:00:59 +0200 |
| commit | a439fe51a1f8eb087c22dd24d69cebae4a3addac (patch) | |
| tree | e32d1fa97a220ab598d8ab364205817c5bf2bd6f /arch/sparc/include/asm/cputime.h | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 (diff) | |
| download | linux-dev-a439fe51a1f8eb087c22dd24d69cebae4a3addac.tar.xz linux-dev-a439fe51a1f8eb087c22dd24d69cebae4a3addac.zip | |
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 '')
| -rw-r--r-- | arch/sparc/include/asm/cputime.h (renamed from include/asm-sparc/cputime.h) | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/include/asm-sparc/cputime.h b/arch/sparc/include/asm/cputime.h index 1a642b81e019..1a642b81e019 100644 --- a/include/asm-sparc/cputime.h +++ b/arch/sparc/include/asm/cputime.h |