Merge remote branch 'origin' into secretlab/next-devicetree

Merging in current state of Linus' tree to deal with merge conflicts and
build failures in vio.c after merge.

Conflicts:
	drivers/i2c/busses/i2c-cpm.c
	drivers/i2c/busses/i2c-mpc.c
	drivers/net/gianfar.c

Also fixed up one line in arch/powerpc/kernel/vio.c to use the
correct node pointer.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/net/qla3xxx.h b/drivers/net/qla3xxx.h
index 7113e71b15a1..3362a661248c 100644
--- a/drivers/net/qla3xxx.h
+++ b/drivers/net/qla3xxx.h
@@ -998,8 +998,8 @@ enum link_state_t {
 struct ql_rcv_buf_cb {
         struct ql_rcv_buf_cb *next;
         struct sk_buff *skb;
-         DECLARE_PCI_UNMAP_ADDR(mapaddr);
-         DECLARE_PCI_UNMAP_LEN(maplen);
+        DEFINE_DMA_UNMAP_ADDR(mapaddr);
+        DEFINE_DMA_UNMAP_LEN(maplen);
         __le32 buf_phy_addr_low;
         __le32 buf_phy_addr_high;
         int index;
@@ -1029,8 +1029,8 @@ struct oal {
 };
 
 struct map_list {
-         DECLARE_PCI_UNMAP_ADDR(mapaddr);
-         DECLARE_PCI_UNMAP_LEN(maplen);
+        DEFINE_DMA_UNMAP_ADDR(mapaddr);
+        DEFINE_DMA_UNMAP_LEN(maplen);
 };
 
 struct ql_tx_buf_cb {