diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-02-12 21:28:00 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-02-12 21:28:00 -0500 |
| commit | fe6af6faec078ec8137631f24cb541f9918244f0 (patch) | |
| tree | a0982a904578f0f6ea0bc4113e9de6bbfbe45e43 /include/asm-powerpc | |
| parent | ec2f9d1331f658433411c58077871e1eef4ee1b4 (diff) | |
| parent | 8f68abbfd9703e58920ff07d314a48654ed0bc3b (diff) | |
Merge branch 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc
Diffstat (limited to 'include/asm-powerpc')
| -rw-r--r-- | include/asm-powerpc/ucc_slow.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-powerpc/ucc_slow.h b/include/asm-powerpc/ucc_slow.h index ca93bc99237e..1babad99c719 100644 --- a/include/asm-powerpc/ucc_slow.h +++ b/include/asm-powerpc/ucc_slow.h | |||
| @@ -150,7 +150,7 @@ struct ucc_slow_info { | |||
| 150 | int ucc_num; | 150 | int ucc_num; |
| 151 | enum qe_clock rx_clock; | 151 | enum qe_clock rx_clock; |
| 152 | enum qe_clock tx_clock; | 152 | enum qe_clock tx_clock; |
| 153 | struct ucc_slow *us_regs; | 153 | struct ucc_slow *regs; |
| 154 | int irq; | 154 | int irq; |
| 155 | u16 uccm_mask; | 155 | u16 uccm_mask; |
| 156 | int data_mem_part; | 156 | int data_mem_part; |