diff options
| author | Dave Jones <davej@redhat.com> | 2006-12-12 17:41:41 -0500 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-12-12 17:41:41 -0500 |
| commit | c4366889dda8110247be59ca41fddb82951a8c26 (patch) | |
| tree | 705c1a996bed8fd48ce94ff33ec9fd00f9b94875 /include/asm-powerpc/spu_csa.h | |
| parent | db2fb9db5735cc532fd4fc55e94b9a3c3750378e (diff) | |
| parent | e1036502e5263851259d147771226161e5ccc85a (diff) | |
Merge ../linus
Conflicts:
drivers/cpufreq/cpufreq.c
Diffstat (limited to 'include/asm-powerpc/spu_csa.h')
| -rw-r--r-- | include/asm-powerpc/spu_csa.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-powerpc/spu_csa.h b/include/asm-powerpc/spu_csa.h index 964c2d38ccb7..bdbf906a767f 100644 --- a/include/asm-powerpc/spu_csa.h +++ b/include/asm-powerpc/spu_csa.h | |||
| @@ -151,7 +151,6 @@ struct spu_priv1_collapsed { | |||
| 151 | u64 mfc_fir_chkstp_enable_RW; | 151 | u64 mfc_fir_chkstp_enable_RW; |
| 152 | u64 smf_sbi_signal_sel; | 152 | u64 smf_sbi_signal_sel; |
| 153 | u64 smf_ato_signal_sel; | 153 | u64 smf_ato_signal_sel; |
| 154 | u64 mfc_sdr_RW; | ||
| 155 | u64 tlb_index_hint_RO; | 154 | u64 tlb_index_hint_RO; |
| 156 | u64 tlb_index_W; | 155 | u64 tlb_index_W; |
| 157 | u64 tlb_vpn_RW; | 156 | u64 tlb_vpn_RW; |