diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-25 12:30:10 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 12:30:10 +0200 |
| commit | 28f73e51d0f64a5b896ad816ab8df6f3bcec5810 (patch) | |
| tree | 8c51ad5ff74d6ef5d1d68121c9f9aadce836736e /include/asm-powerpc/spu_csa.h | |
| parent | f3f3149f35b9195ef4b761b1353fc0766b5f53be (diff) | |
| parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) | |
Merge branch 'linus' into x86/delaytip-x86-delay-2008-06-25_10.30_Wed
Conflicts:
arch/x86/kernel/tsc_32.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-powerpc/spu_csa.h')
| -rw-r--r-- | include/asm-powerpc/spu_csa.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-powerpc/spu_csa.h b/include/asm-powerpc/spu_csa.h index 129ec148d451..a40fd491250c 100644 --- a/include/asm-powerpc/spu_csa.h +++ b/include/asm-powerpc/spu_csa.h @@ -254,7 +254,7 @@ struct spu_state { u64 spu_chnldata_RW[32]; u32 spu_mailbox_data[4]; u32 pu_mailbox_data[1]; - u64 class_0_dar, class_0_dsisr, class_0_pending; + u64 class_0_dar, class_0_pending; u64 class_1_dar, class_1_dsisr; unsigned long suspend_time; spinlock_t register_lock; |