diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-09-13 11:24:25 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-09-13 11:24:25 -0400 |
| commit | b2315372eac9cd9f622c32a93e323cf6f0f03462 (patch) | |
| tree | 9e1faa7cdcddf5d90bec4fb9523742d4cce699a1 /arch/powerpc/sysdev/cpm2_common.c | |
| parent | 5326152fa182b0a16e4abf913ce403e3c7ab53b7 (diff) | |
| parent | c87ce65868bbf9bbea9c3f112ff8315302daf8f2 (diff) | |
Merge branch 'linux-2.6' into for-2.6.24
Diffstat (limited to 'arch/powerpc/sysdev/cpm2_common.c')
| -rw-r--r-- | arch/powerpc/sysdev/cpm2_common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/sysdev/cpm2_common.c b/arch/powerpc/sysdev/cpm2_common.c index dbe8d1802189..3bf89b324760 100644 --- a/arch/powerpc/sysdev/cpm2_common.c +++ b/arch/powerpc/sysdev/cpm2_common.c | |||
| @@ -102,7 +102,7 @@ cpm_setbrg(uint brg, uint rate) | |||
| 102 | brg -= 4; | 102 | brg -= 4; |
| 103 | } | 103 | } |
| 104 | bp += brg; | 104 | bp += brg; |
| 105 | *bp = ((BRG_UART_CLK / rate) << 1) | CPM_BRG_EN; | 105 | out_be32(bp, (((BRG_UART_CLK / rate) - 1) << 1) | CPM_BRG_EN); |
| 106 | 106 | ||
| 107 | cpm2_unmap(bp); | 107 | cpm2_unmap(bp); |
| 108 | } | 108 | } |