Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6

[linux-2.6-omap-h63xx.git] / drivers / infiniband / ulp / ipoib / ipoib.h

diff --git a/drivers/infiniband/ulp/ipoib/ipoib.h b/drivers/infiniband/ulp/ipoib/ipoib.h
index 99547996aba2e742e2c8f1aea10106f7ebeccbe1..07deee8f81ce203e7be98161af36d6cb3a73a6b8 100644 (file)
--- a/drivers/infiniband/ulp/ipoib/ipoib.h
+++ b/drivers/infiniband/ulp/ipoib/ipoib.h
@@ -105,12 +105,12 @@ struct ipoib_mcast;
 
 struct ipoib_rx_buf {
        struct sk_buff *skb;
-       dma_addr_t      mapping;
+       u64             mapping;
 };
 
 struct ipoib_tx_buf {
        struct sk_buff *skb;
-       DECLARE_PCI_UNMAP_ADDR(mapping)
+       u64             mapping;
 };
 
 /*