diff options
author | Paul Mackerras <paulus@samba.org> | 2008-02-21 21:49:13 +1100 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-02-21 21:49:13 +1100 |
commit | a8b87f609d1332216e683b473d33342c86f21ac3 (patch) | |
tree | 128f86486e6ec21307c9047949639062da660ad9 /include | |
parent | 9c0338522896c54b79ad7918638175bf58d7c551 (diff) | |
parent | 61b36fc1f7d511132b1dd1422c29c7a8f26d77db (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jk/spufs into merge
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-powerpc/spu.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/asm-powerpc/spu.h b/include/asm-powerpc/spu.h index f07c99ba5d1..e3c845b0f76 100644 --- a/include/asm-powerpc/spu.h +++ b/include/asm-powerpc/spu.h @@ -98,9 +98,8 @@ #define MFC_PRIV_ATTN_EVENT 0x00000800 #define MFC_MULTI_SRC_EVENT 0x00001000 -/* Flags indicating progress during context switch. */ +/* Flag indicating progress during context switch. */ #define SPU_CONTEXT_SWITCH_PENDING 0UL -#define SPU_CONTEXT_SWITCH_ACTIVE 1UL struct spu_context; struct spu_runqueue; |