diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-25 12:28:47 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 12:28:47 +0200 |
| commit | f4628e644c34d9e6242ea18487b2ed58ee04e3eb (patch) | |
| tree | 3e1cd355fb6959d5b9f569342e4533a48e53aa11 /include/asm-powerpc/spu.h | |
| parent | cb9aa97c21c59ad01c9514d7faf45dc166fba226 (diff) | |
| parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) | |
Merge branch 'linus' into tracing/mmiotrace-mergefixupstip-tracing-mmiotrace-mergefixups-2008-06-25_10.28_Wed
Diffstat (limited to 'include/asm-powerpc/spu.h')
| -rw-r--r-- | include/asm-powerpc/spu.h | 1 |
1 files changed, 0 insertions, 1 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; |