diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-28 09:07:54 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-28 09:07:54 -0400 |
| commit | a403e45c3b678211ee3b7225dbb924921fb5ddd3 (patch) | |
| tree | 6526d8d3c46f2443c7836bf094366179a57e7aad /include/asm-mips/dma-mapping.h | |
| parent | a05d2ebab28011c2f3f520833f4bfdd2fd1b9c02 (diff) | |
| parent | d974ae379a2fbe8948f01eabbc6b19c0a80f09bc (diff) | |
Merge core/lib: pick up memparse() change.
Merge branch 'core/lib' into x86/xen
Diffstat (limited to 'include/asm-mips/dma-mapping.h')
| -rw-r--r-- | include/asm-mips/dma-mapping.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-mips/dma-mapping.h b/include/asm-mips/dma-mapping.h index 230b3f1b69b1..c64afb40cd06 100644 --- a/include/asm-mips/dma-mapping.h +++ b/include/asm-mips/dma-mapping.h | |||
| @@ -42,7 +42,7 @@ extern void dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, | |||
| 42 | int nelems, enum dma_data_direction direction); | 42 | int nelems, enum dma_data_direction direction); |
| 43 | extern void dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, | 43 | extern void dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, |
| 44 | int nelems, enum dma_data_direction direction); | 44 | int nelems, enum dma_data_direction direction); |
| 45 | extern int dma_mapping_error(dma_addr_t dma_addr); | 45 | extern int dma_mapping_error(struct device *dev, dma_addr_t dma_addr); |
| 46 | extern int dma_supported(struct device *dev, u64 mask); | 46 | extern int dma_supported(struct device *dev, u64 mask); |
| 47 | 47 | ||
| 48 | static inline int | 48 | static inline int |