diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-02-13 19:33:39 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-02-13 19:33:39 -0500 |
| commit | 944b380e0c3dead0e16a747dfd3ce2765afac16d (patch) | |
| tree | d1016c273ebac0b4c02d851a854d9a789df632b5 /include/asm-powerpc/spu.h | |
| parent | fff5f52808be01d16bb7c8b82580155ff19e16b0 (diff) | |
| parent | c7eb734766217b9ddac217cbccae3aedcfa67520 (diff) | |
Merge branch 'cell-merge' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arnd/cell-2.6
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 b634e16575f2..0f9f2dd24a79 100644 --- a/include/asm-powerpc/spu.h +++ b/include/asm-powerpc/spu.h | |||
| @@ -129,7 +129,6 @@ struct spu { | |||
| 129 | struct spu_runqueue *rq; | 129 | struct spu_runqueue *rq; |
| 130 | unsigned long long timestamp; | 130 | unsigned long long timestamp; |
| 131 | pid_t pid; | 131 | pid_t pid; |
| 132 | int prio; | ||
| 133 | int class_0_pending; | 132 | int class_0_pending; |
| 134 | spinlock_t register_lock; | 133 | spinlock_t register_lock; |
| 135 | 134 | ||