From 771362dc02484ec6082932aed96b89ed9437d2f9 Mon Sep 17 00:00:00 2001
From: Lennert Buytenhek <buytenh@marvell.com>
Date: Wed, 8 Apr 2009 15:42:46 -0700
Subject: [PATCH] --- yaml --- r: 142867 b: refs/heads/master c:
 b5e86db4c7f6397ef86ab5e4a3fbece966935577 h: refs/heads/master i:   142865:
 16ffd6ae9220845744826077d98785fae3205520   142863:
 ee2d042c4cbbd9e086ec85814d17c2b8cb047538 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/net/mv643xx_eth.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index b82689c826d4..9ca45af1e82c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 150899d29367eb60302bcb710e779617d04aceea
+refs/heads/master: b5e86db4c7f6397ef86ab5e4a3fbece966935577
diff --git a/trunk/drivers/net/mv643xx_eth.c b/trunk/drivers/net/mv643xx_eth.c
index a56d9d2df73f..b3185bf2c158 100644
--- a/trunk/drivers/net/mv643xx_eth.c
+++ b/trunk/drivers/net/mv643xx_eth.c
@@ -2274,8 +2274,6 @@ static void port_start(struct mv643xx_eth_private *mp)
 		pscr |= FORCE_LINK_PASS;
 	wrlp(mp, PORT_SERIAL_CONTROL, pscr);
 
-	wrlp(mp, SDMA_CONFIG, PORT_SDMA_CONFIG_DEFAULT_VALUE);
-
 	/*
 	 * Configure TX path and queues.
 	 */
@@ -2957,6 +2955,8 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
 
 	netif_carrier_off(dev);
 
+	wrlp(mp, SDMA_CONFIG, PORT_SDMA_CONFIG_DEFAULT_VALUE);
+
 	set_rx_coal(mp, 250);
 	set_tx_coal(mp, 0);