From 90eb454a1b42f8e2486046a7c919cec7759ceb6d Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Wed, 27 Jul 2005 01:14:44 -0700
Subject: [PATCH] --- yaml --- r: 6111 b: refs/heads/master c:
 b4ee21f442ba7a8c43e00b32088d437259890cd0 h: refs/heads/master i:   6109:
 537070b5d298be3d0da3341091f0d9b70965ffe4   6107:
 40b56c25b39e8b709d7ecf2e21417efb157cd482   6103:
 d876063e4143d5098b2d13d513da597e29e85812   6095:
 8c8d6e0419dfd802362870d1ca9229c7dd54f86f   6079:
 5ac5efd0eaf7f1ce7710585213acb7767b749e86 v: v3

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

diff --git a/[refs] b/[refs]
index 90245358e0fb..1ca0264f08de 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d9a8a0a3574525bf422fd2f05eec739c0d25814f
+refs/heads/master: b4ee21f442ba7a8c43e00b32088d437259890cd0
diff --git a/trunk/drivers/net/e1000/e1000_main.c b/trunk/drivers/net/e1000/e1000_main.c
index b82fd15d0891..9b596e0bbf95 100644
--- a/trunk/drivers/net/e1000/e1000_main.c
+++ b/trunk/drivers/net/e1000/e1000_main.c
@@ -2767,7 +2767,7 @@ e1000_clean_tx_irq(struct e1000_adapter *adapter)
 					"  next_to_use          <%x>\n"
 					"  next_to_clean        <%x>\n"
 					"buffer_info[next_to_clean]\n"
-					"  dma                  <%zx>\n"
+					"  dma                  <%llx>\n"
 					"  time_stamp           <%lx>\n"
 					"  next_to_watch        <%x>\n"
 					"  jiffies              <%lx>\n"
@@ -2776,7 +2776,7 @@ e1000_clean_tx_irq(struct e1000_adapter *adapter)
 				E1000_READ_REG(&adapter->hw, TDT),
 				tx_ring->next_to_use,
 				i,
-				tx_ring->buffer_info[i].dma,
+				(unsigned long long)tx_ring->buffer_info[i].dma,
 				tx_ring->buffer_info[i].time_stamp,
 				eop,
 				jiffies,