diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-25 19:03:08 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-25 19:03:08 -0400 |
| commit | 4208ff04a2dea2f55111a6cdc7e21f6ec3aef29f (patch) | |
| tree | 4a3b64a319ff55081b9c5447587930cbf698780b /include/asm-arm/signal.h | |
| parent | 43df5eac00734436e2bc5a5c11488b1a7accecc7 (diff) | |
| parent | 8749af68216e1ebf6460992fce548f400ecf63a4 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'include/asm-arm/signal.h')
| -rw-r--r-- | include/asm-arm/signal.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-arm/signal.h b/include/asm-arm/signal.h index 46e69ae395af..760f6e65af05 100644 --- a/include/asm-arm/signal.h +++ b/include/asm-arm/signal.h | |||
| @@ -114,6 +114,7 @@ typedef unsigned long sigset_t; | |||
| 114 | #define SIGSTKSZ 8192 | 114 | #define SIGSTKSZ 8192 |
| 115 | 115 | ||
| 116 | #ifdef __KERNEL__ | 116 | #ifdef __KERNEL__ |
| 117 | #define SA_TIMER 0x40000000 | ||
| 117 | #define SA_IRQNOMASK 0x08000000 | 118 | #define SA_IRQNOMASK 0x08000000 |
| 118 | #endif | 119 | #endif |
| 119 | 120 | ||