]> git.hungrycats.org Git - linux/commitdiff
[PATCH] yellowfin: correct printk of dma_addr_t
authorRandy Dunlap <rddunlap@osdl.org>
Tue, 3 Feb 2004 22:05:35 +0000 (17:05 -0500)
committerJeff Garzik <jgarzik@redhat.com>
Tue, 3 Feb 2004 22:05:35 +0000 (17:05 -0500)
fix dma_addr_t type error with CONFIG_HIGHMEM64G=y;

drivers/net/yellowfin.c

index c22ca46b0d811eb5525b515daea4df65b60d1d49..2490b376aae2b5024b8ed0bfbeb911bc765d8178 100644 (file)
@@ -1286,7 +1286,8 @@ static int yellowfin_close(struct net_device *dev)
 
 #if defined(__i386__)
        if (yellowfin_debug > 2) {
-               printk("\n"KERN_DEBUG"  Tx ring at %8.8x:\n", yp->tx_ring_dma);
+               printk("\n"KERN_DEBUG"  Tx ring at %8.8llx:\n",
+                               (unsigned long long)yp->tx_ring_dma);
                for (i = 0; i < TX_RING_SIZE*2; i++)
                        printk(" %c #%d desc. %8.8x %8.8x %8.8x %8.8x.\n",
                                   inl(ioaddr + TxPtr) == (long)&yp->tx_ring[i] ? '>' : ' ',
@@ -1298,7 +1299,8 @@ static int yellowfin_close(struct net_device *dev)
                                   i, yp->tx_status[i].tx_cnt, yp->tx_status[i].tx_errs,
                                   yp->tx_status[i].total_tx_cnt, yp->tx_status[i].paused);
 
-               printk("\n"KERN_DEBUG "  Rx ring %8.8x:\n", yp->rx_ring_dma);
+               printk("\n"KERN_DEBUG "  Rx ring %8.8llx:\n",
+                               (unsigned long long)yp->rx_ring_dma);
                for (i = 0; i < RX_RING_SIZE; i++) {
                        printk(KERN_DEBUG " %c #%d desc. %8.8x %8.8x %8.8x\n",
                                   inl(ioaddr + RxPtr) == (long)&yp->rx_ring[i] ? '>' : ' ',