diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-14 09:35:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-14 09:35:34 -0700 |
| commit | 186051d70444742bf1c2bc0257dd4696a3df66e3 (patch) | |
| tree | 0c54ee48fa3c9a47cdb82fc29f8632c376790c8a /drivers/net/s2io.c | |
| parent | 668e4bc7229c1866f65f3bef6ab011f8c9034089 (diff) | |
| parent | e172577da02cde3916e75406b314e6f01c228a5c (diff) | |
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/s2io.c')
| -rw-r--r-- | drivers/net/s2io.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c index c829e6a2e8a..dd451e099a4 100644 --- a/drivers/net/s2io.c +++ b/drivers/net/s2io.c @@ -428,7 +428,7 @@ static int init_shared_mem(struct s2io_nic *nic) DBG_PRINT(INIT_DBG, "%s: Zero DMA address for TxDL. ", dev->name); DBG_PRINT(INIT_DBG, - "Virtual address %llx\n", (u64)tmp_v); + "Virtual address %p\n", tmp_v); tmp_v = pci_alloc_consistent(nic->pdev, PAGE_SIZE, &tmp_p); if (!tmp_v) { @@ -657,9 +657,10 @@ static void free_shared_mem(struct s2io_nic *nic) mac_control->zerodma_virt_addr, (dma_addr_t)0); DBG_PRINT(INIT_DBG, - "%s: Freeing TxDL with zero DMA addr. ", dev->name); - DBG_PRINT(INIT_DBG, "Virtual address %llx\n", - (u64)(mac_control->zerodma_virt_addr)); + "%s: Freeing TxDL with zero DMA addr. ", + dev->name); + DBG_PRINT(INIT_DBG, "Virtual address %p\n", + mac_control->zerodma_virt_addr); } kfree(mac_control->fifos[i].list_info); } |