Merge branch 'linux-2.6' into for-2.6.24

[linux-2.6.git] / arch / powerpc / sysdev / cpm2_common.c

diff --git a/arch/powerpc/sysdev/cpm2_common.c b/arch/powerpc/sysdev/cpm2_common.c
index dbe8d1802189ffea8f307ae316a88faf42449971..3bf89b324760e6c936daceb39c67324c4753017b 100644 (file)
--- a/arch/powerpc/sysdev/cpm2_common.c
+++ b/arch/powerpc/sysdev/cpm2_common.c
@@ -102,7 +102,7 @@ cpm_setbrg(uint brg, uint rate)
                brg -= 4;
        }
        bp += brg;
-       *bp = ((BRG_UART_CLK / rate) << 1) | CPM_BRG_EN;
+       out_be32(bp, (((BRG_UART_CLK / rate) - 1) << 1) | CPM_BRG_EN);
 
        cpm2_unmap(bp);
 }