From 519c6eb4fe2d28cda8d4b182597e44abe5f8df5d Mon Sep 17 00:00:00 2001
From: Mika Westerberg <mika.westerberg@linux.intel.com>
Date: Fri, 14 Sep 2012 00:33:48 +0000
Subject: [PATCH] --- yaml --- r: 327999 b: refs/heads/master c:
 1d3ff76759b70e201e6b379c37ac106c487ff506 h: refs/heads/master i:   327997:
 7632da6e6cf52c66e9abf8c55452bf3db6b11aa1   327995:
 1fb2e69bc81f65cbb3480cd7e14b9da9c209acf1   327991:
 184d11d1d17a143be153d98e9cfc98674a09032c   327983:
 a341045945579363ce3f19dc9a10d70f1fe7d218   327967:
 558461930d4e1cb46030d08d974b6064dd55e145   327935:
 3ebd1de9bf70429a4e717ea91423c18d0538f2c4 v: v3

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

diff --git a/[refs] b/[refs]
index da872840a13b..2af55e3ec540 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6b78f16e4bdde3936b11690bdb970be423e07a07
+refs/heads/master: 1d3ff76759b70e201e6b379c37ac106c487ff506
diff --git a/trunk/drivers/net/ethernet/i825xx/znet.c b/trunk/drivers/net/ethernet/i825xx/znet.c
index ba4e0cea3506..c9479e081b8a 100644
--- a/trunk/drivers/net/ethernet/i825xx/znet.c
+++ b/trunk/drivers/net/ethernet/i825xx/znet.c
@@ -865,14 +865,14 @@ static void hardware_init(struct net_device *dev)
 	disable_dma(znet->rx_dma); 		/* reset by an interrupting task. */
 	clear_dma_ff(znet->rx_dma);
 	set_dma_mode(znet->rx_dma, DMA_RX_MODE);
-	set_dma_addr(znet->rx_dma, (unsigned int) znet->rx_start);
+	set_dma_addr(znet->rx_dma, isa_virt_to_bus(znet->rx_start));
 	set_dma_count(znet->rx_dma, RX_BUF_SIZE);
 	enable_dma(znet->rx_dma);
 	/* Now set up the Tx channel. */
 	disable_dma(znet->tx_dma);
 	clear_dma_ff(znet->tx_dma);
 	set_dma_mode(znet->tx_dma, DMA_TX_MODE);
-	set_dma_addr(znet->tx_dma, (unsigned int) znet->tx_start);
+	set_dma_addr(znet->tx_dma, isa_virt_to_bus(znet->tx_start));
 	set_dma_count(znet->tx_dma, znet->tx_buf_len<<1);
 	enable_dma(znet->tx_dma);
 	release_dma_lock(flags);