diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-04 10:16:31 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-04 10:16:31 -0400 |
| commit | 2ee73cc2d507df7b28050fba5d08bd33dd34848c (patch) | |
| tree | af5f33b265318e0f4b61f788691fe4f780ec402c /include/asm-arm/signal.h | |
| parent | c1d9728ecc5b560465df3c0c0d3b3825c2710b40 (diff) | |
| parent | ed39f731ab2e77e58122232f6e27333331d7793d (diff) | |
Merge /spare/repo/linux-2.6/
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> |