diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-12 15:23:51 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-12 15:23:51 -0400 |
| commit | c87ce65868bbf9bbea9c3f112ff8315302daf8f2 (patch) | |
| tree | dc4a038bf888bd78b75a23e120c7fa737960fedf /arch/powerpc/sysdev/cpm2_common.c | |
| parent | c413fecc763e380ec93dc6faf726e7e735ade04e (diff) | |
| parent | ee56c47440ab04c6a35c835a9bcc4193304adf93 (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] Move serial_dev_init to device_initcall()
[POWERPC] Enable GENERIC_ISA_DMA if FSL_ULI1575 to fix compile issue
[POWERPC] cpm2: Fix off-by-one error in setbrg().
[PPC] 8xx: Fix r3 trashing due to 8MB TLB page instantiation
[POWERPC] 8{5,6}xx: Fix build issue with !CONFIG_PCI
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 924412974795..c827715a5090 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 | } |