aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/powerpc/kernel/dma_64.c7
-rw-r--r--include/asm-powerpc/dma-mapping.h2
2 files changed, 4 insertions, 5 deletions
diff --git a/arch/powerpc/kernel/dma_64.c b/arch/powerpc/kernel/dma_64.c
index a2d076d005c0..72fdc06df51e 100644
--- a/arch/powerpc/kernel/dma_64.c
+++ b/arch/powerpc/kernel/dma_64.c
@@ -112,10 +112,11 @@ EXPORT_SYMBOL(dma_iommu_ops);
112/* 112/*
113 * Generic direct DMA implementation 113 * Generic direct DMA implementation
114 * 114 *
115 * This implementation supports a global offset that can be applied if 115 * This implementation supports a per-device offset that can be applied if
116 * the address at which memory is visible to devices is not 0. 116 * the address at which memory is visible to devices is not 0. Platform code
117 * can set archdata.dma_data to an unsigned long holding the offset. By
118 * default the offset is zero.
117 */ 119 */
118unsigned long dma_direct_offset;
119 120
120static unsigned long get_dma_direct_offset(struct device *dev) 121static unsigned long get_dma_direct_offset(struct device *dev)
121{ 122{
diff --git a/include/asm-powerpc/dma-mapping.h b/include/asm-powerpc/dma-mapping.h
index e974876e18d2..5eea6dbc0aa2 100644
--- a/include/asm-powerpc/dma-mapping.h
+++ b/include/asm-powerpc/dma-mapping.h
@@ -189,8 +189,6 @@ static inline void dma_unmap_sg(struct device *dev, struct scatterlist *sg,
189extern struct dma_mapping_ops dma_iommu_ops; 189extern struct dma_mapping_ops dma_iommu_ops;
190extern struct dma_mapping_ops dma_direct_ops; 190extern struct dma_mapping_ops dma_direct_ops;
191 191
192extern unsigned long dma_direct_offset;
193
194#else /* CONFIG_PPC64 */ 192#else /* CONFIG_PPC64 */
195 193
196#define dma_supported(dev, mask) (1) 194#define dma_supported(dev, mask) (1)