diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-03 19:46:45 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-03 19:46:45 -0400 |
| commit | 2b235826098bb653982894dfc3f70fd029f6c2e4 (patch) | |
| tree | ec525ddba74f58017a3f145bb68cf94376648c1c /include/asm-arm/signal.h | |
| parent | b4b52db71529bbe46da914eda772fb574914c94d (diff) | |
| parent | c77054e518d9163578cfcad09826d7b959f95ece (diff) | |
Merge branch 'master'
Diffstat (limited to 'include/asm-arm/signal.h')
| -rw-r--r-- | include/asm-arm/signal.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-arm/signal.h b/include/asm-arm/signal.h index 760f6e65af05..ced69161917b 100644 --- a/include/asm-arm/signal.h +++ b/include/asm-arm/signal.h | |||
| @@ -115,7 +115,6 @@ typedef unsigned long sigset_t; | |||
| 115 | 115 | ||
| 116 | #ifdef __KERNEL__ | 116 | #ifdef __KERNEL__ |
| 117 | #define SA_TIMER 0x40000000 | 117 | #define SA_TIMER 0x40000000 |
| 118 | #define SA_IRQNOMASK 0x08000000 | ||
| 119 | #endif | 118 | #endif |
| 120 | 119 | ||
| 121 | #include <asm-generic/signal.h> | 120 | #include <asm-generic/signal.h> |