Merge branch 'master' into for-linus

1 files changed, 5 insertions, 2 deletions

diff --git a/arch/powerpc/include/asm/device.h b/arch/powerpc/include/asm/device.h
index e3e06e0f7fc0..9dade15d1ab4 100644
--- a/arch/powerpc/include/asm/device.h
+++ b/arch/powerpc/include/asm/device.h
@@ -6,7 +6,7 @@
 #ifndef _ASM_POWERPC_DEVICE_H
 #define _ASM_POWERPC_DEVICE_H
 
-struct dma_mapping_ops;
+struct dma_map_ops;
 struct device_node;
 
 struct dev_archdata {
@@ -14,8 +14,11 @@ struct dev_archdata {
         struct device_node      *of_node;
 
         /* DMA operations on that device */
-        struct dma_mapping_ops  *dma_ops;
+        struct dma_map_ops      *dma_ops;
         void                    *dma_data;
+#ifdef CONFIG_SWIOTLB
+        dma_addr_t              max_direct_dma_addr;
+#endif
 };
 
 static inline void dev_archdata_set_node(struct dev_archdata *ad,