]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Revert "i825xx: znet: fix compiler warnings when building a 64-bit kernel"
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 20 Sep 2012 07:32:47 +0000 (17:32 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 20 Sep 2012 07:32:47 +0000 (17:32 +1000)
This reverts commit 1d3ff76759b70e201e6b379c37ac106c487ff506.

drivers/net/ethernet/i825xx/znet.c

index c9479e081b8aa0507a980d6bb1bc11af1d1adbc0..ba4e0cea3506f80da5cc36a69f22994a7a3e470e 100644 (file)
@@ -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, isa_virt_to_bus(znet->rx_start));
+       set_dma_addr(znet->rx_dma, (unsigned int) 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, isa_virt_to_bus(znet->tx_start));
+       set_dma_addr(znet->tx_dma, (unsigned int) znet->tx_start);
        set_dma_count(znet->tx_dma, znet->tx_buf_len<<1);
        enable_dma(znet->tx_dma);
        release_dma_lock(flags);