diff options
| author | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
| commit | 64e47488c913ac704d465a6af86a26786d1412a5 (patch) | |
| tree | d3b0148592963dcde26e4bb35ddfec8b1eaf8e23 /include/asm-mips/siginfo.h | |
| parent | 4a35a46bf1cda4737c428380d1db5d15e2590d18 (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge linux-2.6 with linux-acpi-2.6
Diffstat (limited to 'include/asm-mips/siginfo.h')
| -rw-r--r-- | include/asm-mips/siginfo.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-mips/siginfo.h b/include/asm-mips/siginfo.h index a0e26e6c994d..698becab5a9e 100644 --- a/include/asm-mips/siginfo.h +++ b/include/asm-mips/siginfo.h | |||
| @@ -25,10 +25,10 @@ struct siginfo; | |||
| 25 | /* | 25 | /* |
| 26 | * Careful to keep union _sifields from shifting ... | 26 | * Careful to keep union _sifields from shifting ... |
| 27 | */ | 27 | */ |
| 28 | #ifdef CONFIG_MIPS32 | 28 | #ifdef CONFIG_32BIT |
| 29 | #define __ARCH_SI_PREAMBLE_SIZE (3 * sizeof(int)) | 29 | #define __ARCH_SI_PREAMBLE_SIZE (3 * sizeof(int)) |
| 30 | #endif | 30 | #endif |
| 31 | #ifdef CONFIG_MIPS64 | 31 | #ifdef CONFIG_64BIT |
| 32 | #define __ARCH_SI_PREAMBLE_SIZE (4 * sizeof(int)) | 32 | #define __ARCH_SI_PREAMBLE_SIZE (4 * sizeof(int)) |
| 33 | #endif | 33 | #endif |
| 34 | 34 | ||