diff options
| author | David S. Miller <davem@nuts.ninka.net> | 2002-08-31 07:30:46 -0700 |
|---|---|---|
| committer | David S. Miller <davem@nuts.ninka.net> | 2002-08-31 07:30:46 -0700 |
| commit | 117efdbb3ed0f2b56fc7df7b4224770419255dc1 (patch) | |
| tree | a3e15460357e3c213d0475b054167d6dffad5766 /include | |
| parent | 1016206390a89aa1aae6565ee85cadfa822b9f8a (diff) | |
| parent | a4af00fe39ccb9444652a5f0eeb183ca6f04b613 (diff) | |
Merge nuts.ninka.net:/home/davem/src/BK/sparcwork-2.5
into nuts.ninka.net:/home/davem/src/BK/sparc-2.5
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-sparc64/hardirq.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-sparc64/hardirq.h b/include/asm-sparc64/hardirq.h index 0a65648f21e0..88e27b030c6d 100644 --- a/include/asm-sparc64/hardirq.h +++ b/include/asm-sparc64/hardirq.h @@ -35,8 +35,8 @@ typedef struct { * - ( bit 26 is the PREEMPT_ACTIVE flag. ) * * PREEMPT_MASK: 0x000000ff - * HARDIRQ_MASK: 0x0000ff00 - * SOFTIRQ_MASK: 0x00ff0000 + * SOFTIRQ_MASK: 0x0000ff00 + * HARDIRQ_MASK: 0x00ff0000 */ #define PREEMPT_BITS 8 |