diff --git a/[refs] b/[refs]
index 02167dc6dbcb..65328ab77346 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fcb01756e8e95e8d4e423377bc435e8856194328
+refs/heads/master: b40a1f06c062d5fb2dc11fcb826d97b28918524f
diff --git a/trunk/drivers/net/ixgb/ixgb.h b/trunk/drivers/net/ixgb/ixgb.h
index f8d3385c7842..c83271b38621 100644
--- a/trunk/drivers/net/ixgb/ixgb.h
+++ b/trunk/drivers/net/ixgb/ixgb.h
@@ -119,7 +119,7 @@ struct ixgb_adapter;
  * so a DMA handle can be stored along with the buffer */
 struct ixgb_buffer {
 	struct sk_buff *skb;
-	uint64_t dma;
+	dma_addr_t dma;
 	unsigned long time_stamp;
 	uint16_t length;
 	uint16_t next_to_watch;