diff options
| author | Nathan Scott <nathans@bruce> | 2006-01-11 21:34:47 -0500 |
|---|---|---|
| committer | Nathan Scott <nathans@bruce> | 2006-01-11 21:34:47 -0500 |
| commit | ddae9c2ea79449beb00027cf77fca6dc489f2d15 (patch) | |
| tree | 047c2d7c8d6cbb0721f017514e1d83a20e278d43 /include/asm-powerpc/elf.h | |
| parent | 0d1335b3106687d87fcfa0e4d90f2a961bd7e1db (diff) | |
| parent | a4fc7ab1d065a9dd89ed0e74439ef87d4a16e980 (diff) | |
Merge HEAD from oss.sgi.com:/oss/git/linux-2.6.git
Diffstat (limited to 'include/asm-powerpc/elf.h')
| -rw-r--r-- | include/asm-powerpc/elf.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-powerpc/elf.h b/include/asm-powerpc/elf.h index c5a635d9bba4..45f2af6f89c4 100644 --- a/include/asm-powerpc/elf.h +++ b/include/asm-powerpc/elf.h | |||
| @@ -92,7 +92,6 @@ | |||
| 92 | * as published by the Free Software Foundation; either version | 92 | * as published by the Free Software Foundation; either version |
| 93 | * 2 of the License, or (at your option) any later version. | 93 | * 2 of the License, or (at your option) any later version. |
| 94 | */ | 94 | */ |
| 95 | #include <asm/ptrace.h> | ||
| 96 | 95 | ||
| 97 | #define ELF_NGREG 48 /* includes nip, msr, lr, etc. */ | 96 | #define ELF_NGREG 48 /* includes nip, msr, lr, etc. */ |
| 98 | #define ELF_NFPREG 33 /* includes fpscr */ | 97 | #define ELF_NFPREG 33 /* includes fpscr */ |