Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=4696c3...
Commit:     4696c3c406a8b32112f8e1f70b3db1114950dcb1
Parent:     3d722562d734834282bccd97e0badd213ec311e9
Author:     Valentine Barshak <vbarshak@ru.mvista.com>
AuthorDate: Wed Dec 5 11:14:31 2007 +1100
Committer:  Jeff Garzik <jeff@garzik.org>
CommitDate: Fri Dec 7 15:09:06 2007 -0500

    ibm_newemac: Correct opb_bus_freq value
    
    The EMAC4_MR1_OBCI(freq) macro expects freg in MHz,
    while opb_bus_freq is kept in Hz. Correct this.
    
    Signed-off-by: Valentine Barshak <vbarshak@ru.mvista.com>
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
---
 drivers/net/ibm_newemac/core.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c
index a77207f..9642931 100644
--- a/drivers/net/ibm_newemac/core.c
+++ b/drivers/net/ibm_newemac/core.c
@@ -402,7 +402,7 @@ static u32 __emac_calc_base_mr1(struct emac_instance *dev, int tx_size, int rx_s
 static u32 __emac4_calc_base_mr1(struct emac_instance *dev, int tx_size, int rx_size)
 {
 	u32 ret = EMAC_MR1_VLE | EMAC_MR1_IST | EMAC4_MR1_TR |
-		EMAC4_MR1_OBCI(dev->opb_bus_freq);
+		EMAC4_MR1_OBCI(dev->opb_bus_freq / 1000000);
 
 	DBG2(dev, "__emac4_calc_base_mr1" NL);
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html