diff --git a/[refs] b/[refs] index 6d67a88cde06..4ef0adb4bc57 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b9f69f4f4a953b2b5299fff7fc98e69221e29514 +refs/heads/master: 2e8fcfe2e51b2ee0fef3313e3c9ec25b9d6ed255 diff --git a/trunk/arch/sparc/include/asm/dma-mapping_64.h b/trunk/arch/sparc/include/asm/dma-mapping_64.h index 017ae706ac64..0c4fb1f81caf 100644 --- a/trunk/arch/sparc/include/asm/dma-mapping_64.h +++ b/trunk/arch/sparc/include/asm/dma-mapping_64.h @@ -23,9 +23,15 @@ struct dma_ops { void (*sync_single_for_cpu)(struct device *dev, dma_addr_t dma_handle, size_t size, enum dma_data_direction direction); + void (*sync_single_for_device)(struct device *dev, + dma_addr_t dma_handle, size_t size, + enum dma_data_direction direction); void (*sync_sg_for_cpu)(struct device *dev, struct scatterlist *sg, int nelems, enum dma_data_direction direction); + void (*sync_sg_for_device)(struct device *dev, + struct scatterlist *sg, int nents, + enum dma_data_direction dir); }; extern const struct dma_ops *dma_ops;