diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-06-16 14:52:56 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-06-16 14:52:56 +1000 |
| commit | e80ac32767d0f781ac195c472d500a7451d3729a (patch) | |
| tree | b207d2cf02651205d4785ff4ec3c3d42b0c36ac8 /include | |
| parent | ecab9ab22a9a64d6412961e42a5a23c74c6b6220 (diff) | |
| parent | 028fda0a6c80c26f1d9f403b4490b9ddc74ffa3b (diff) | |
| download | linux-e80ac32767d0f781ac195c472d500a7451d3729a.tar.gz linux-e80ac32767d0f781ac195c472d500a7451d3729a.tar.bz2 linux-e80ac32767d0f781ac195c472d500a7451d3729a.zip | |
Merge branch 'merge' 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 | 1 | ||||
| -rw-r--r-- | include/asm-powerpc/spu_csa.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/include/asm-powerpc/spu.h b/include/asm-powerpc/spu.h index 6abead6e681a..99348c1f4cab 100644 --- a/include/asm-powerpc/spu.h +++ b/include/asm-powerpc/spu.h @@ -131,7 +131,6 @@ struct spu { u64 flags; u64 class_0_pending; u64 class_0_dar; - u64 class_0_dsisr; u64 class_1_dar; u64 class_1_dsisr; size_t ls_size; 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; |