2 files changed, 3 insertions, 3 deletions

diff --git a/drivers/net/e1000/e1000.h b/drivers/net/e1000/e1000.h
index 2b96a259be8a..092757bc721f 100644
--- a/drivers/net/e1000/e1000.h
+++ b/drivers/net/e1000/e1000.h
@@ -159,7 +159,7 @@ struct e1000_adapter;
  * so a DMA handle can be stored along with the buffer */
 struct e1000_buffer {
         struct sk_buff *skb;
-        uint64_t dma;
+        dma_addr_t dma;
         unsigned long time_stamp;
         uint16_t length;
         uint16_t next_to_watch;
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 936fde1f38cc..24c31fff4a75 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -2769,13 +2769,13 @@ e1000_clean_tx_irq(struct e1000_adapter *adapter)
                         i = tx_ring->next_to_clean;
                         eop = tx_ring->buffer_info[i].next_to_watch;
                         eop_desc = E1000_TX_DESC(*tx_ring, eop);
-                        DPRINTK(TX_ERR, ERR, "Detected Tx Unit Hang\n"
+                        DPRINTK(DRV, ERR, "Detected Tx Unit Hang\n"
                                         "  TDH                  <%x>\n"
                                         "  TDT                  <%x>\n"
                                         "  next_to_use          <%x>\n"
                                         "  next_to_clean        <%x>\n"
                                         "buffer_info[next_to_clean]\n"
-                                        "  dma                  <%llx>\n"
+                                        "  dma                  <%zx>\n"
                                         "  time_stamp           <%lx>\n"
                                         "  next_to_watch        <%x>\n"
                                         "  jiffies              <%lx>\n"