From c1015801bbb81deeac52055fefa63409ae8e5e41 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 25 Oct 2005 16:56:43 +1000
Subject: [PATCH] --- yaml --- r: 11668 b: refs/heads/master c:
 8168f902fa9c2ca8930ea8d72cce283234df03b8 h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/net/ibmveth.c           | 2 +-
 trunk/include/asm-powerpc/types.h     | 4 ++++
 trunk/include/asm-ppc64/scatterlist.h | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index c0b66ee74861..2826ff90d41a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bf20a0000377f7bdeb42b78b10ed578deb3d63f1
+refs/heads/master: 8168f902fa9c2ca8930ea8d72cce283234df03b8
diff --git a/trunk/drivers/net/ibmveth.c b/trunk/drivers/net/ibmveth.c
index f5dc632452f1..cbe9368a4d56 100644
--- a/trunk/drivers/net/ibmveth.c
+++ b/trunk/drivers/net/ibmveth.c
@@ -532,7 +532,7 @@ static int ibmveth_open(struct net_device *netdev)
 
 	if(lpar_rc != H_Success) {
 		ibmveth_error_printk("h_register_logical_lan failed with %ld\n", lpar_rc);
-		ibmveth_error_printk("buffer TCE:0x%x filter TCE:0x%x rxq desc:0x%lx MAC:0x%lx\n",
+		ibmveth_error_printk("buffer TCE:0x%lx filter TCE:0x%lx rxq desc:0x%lx MAC:0x%lx\n",
 				     adapter->buffer_list_dma,
 				     adapter->filter_list_dma,
 				     rxq_desc.desc,
diff --git a/trunk/include/asm-powerpc/types.h b/trunk/include/asm-powerpc/types.h
index f70cd3fb32d9..ec3c2ee8bf86 100644
--- a/trunk/include/asm-powerpc/types.h
+++ b/trunk/include/asm-powerpc/types.h
@@ -85,7 +85,11 @@ typedef unsigned long long u64;
 
 typedef __vector128 vector128;
 
+#ifdef __powerpc64__
+typedef u64 dma_addr_t;
+#else
 typedef u32 dma_addr_t;
+#endif
 typedef u64 dma64_addr_t;
 
 typedef struct {
diff --git a/trunk/include/asm-ppc64/scatterlist.h b/trunk/include/asm-ppc64/scatterlist.h
index cecce6c6dfbb..65a2a027ac94 100644
--- a/trunk/include/asm-ppc64/scatterlist.h
+++ b/trunk/include/asm-ppc64/scatterlist.h
@@ -19,7 +19,7 @@ struct scatterlist {
 	unsigned int length;
 
 	/* For TCE support */
-	u32 dma_address;
+	dma_addr_t dma_address;
 	u32 dma_length;
 };