diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 13:31:12 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 13:31:12 -0400 |
| commit | 3e370b29d35fb01bfb92c2814d6f79bf6a2cb970 (patch) | |
| tree | 3b8fb467d60bfe6a34686f4abdc3a60050ba40a4 /include/asm-mips/signal.h | |
| parent | 88d1dce3a74367291f65a757fbdcaf17f042f30c (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
Merge branch 'linus' into x86/pci-ioapic-boot-irq-quirks
Conflicts:
drivers/pci/quirks.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-mips/signal.h')
| -rw-r--r-- | include/asm-mips/signal.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/asm-mips/signal.h b/include/asm-mips/signal.h index 7a28989f7ee3..bee5153aca48 100644 --- a/include/asm-mips/signal.h +++ b/include/asm-mips/signal.h | |||
| @@ -119,9 +119,6 @@ struct sigaction { | |||
| 119 | 119 | ||
| 120 | struct k_sigaction { | 120 | struct k_sigaction { |
| 121 | struct sigaction sa; | 121 | struct sigaction sa; |
| 122 | #ifdef CONFIG_BINFMT_IRIX | ||
| 123 | void (*sa_restorer)(void); | ||
| 124 | #endif | ||
| 125 | }; | 122 | }; |
| 126 | 123 | ||
| 127 | /* IRIX compatible stack_t */ | 124 | /* IRIX compatible stack_t */ |