From 7911c35b74b46db378c56f86142788e925b4944a Mon Sep 17 00:00:00 2001 From: "vbarshak@ru.mvista.com" Date: Tue, 2 Oct 2007 16:01:07 +0400 Subject: [PATCH] --- yaml --- r: 66907 b: refs/heads/master c: 07c2c76e27e629fb5c9a539e249906802866abb8 h: refs/heads/master i: 66905: 045779199dcbc17085fa1445f9004b27012d388b 66903: fd68d899acb2ec327b8b04622f2539b624b10d82 v: v3 --- [refs] | 2 +- trunk/drivers/net/ibm_newemac/core.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f0a556443d9b..7e0d5b7fb745 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1dad939ddbbd8d64e1edc7799df00a9e591b4197 +refs/heads/master: 07c2c76e27e629fb5c9a539e249906802866abb8 diff --git a/trunk/drivers/net/ibm_newemac/core.c b/trunk/drivers/net/ibm_newemac/core.c index 653bfdc291e0..ce127b9cafa4 100644 --- a/trunk/drivers/net/ibm_newemac/core.c +++ b/trunk/drivers/net/ibm_newemac/core.c @@ -1232,9 +1232,9 @@ static inline int emac_xmit_finish(struct emac_instance *dev, int len) * instead */ if (emac_has_feature(dev, EMAC_FTR_EMAC4)) - out_be32(&p->tmr0, EMAC_TMR0_XMIT); - else out_be32(&p->tmr0, EMAC4_TMR0_XMIT); + else + out_be32(&p->tmr0, EMAC_TMR0_XMIT); if (unlikely(++dev->tx_cnt == NUM_TX_BUFF)) { netif_stop_queue(ndev);