diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2012-10-09 15:20:05 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2012-10-09 15:20:05 -0400 |
| commit | db8c246937713e60b7628661ccc187eeb81f2bae (patch) | |
| tree | 6351e8bca23eef40fce85396d1c6f6cfffbd4b66 /include/linux/dma-mapping.h | |
| parent | c5f66e99b7cb091e3d51ae8e8156892e8feb7fa3 (diff) | |
| parent | 28f2b02bc581ffc835bc1691b18d03f62fcf0395 (diff) | |
Merge branch 'fortglx/3.7/time' of git://git.linaro.org/people/jstultz/linux into timers/core
Diffstat (limited to 'include/linux/dma-mapping.h')
| -rw-r--r-- | include/linux/dma-mapping.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h index dfc099e56a66..94af41858513 100644 --- a/include/linux/dma-mapping.h +++ b/include/linux/dma-mapping.h | |||
| @@ -18,6 +18,9 @@ struct dma_map_ops { | |||
| 18 | int (*mmap)(struct device *, struct vm_area_struct *, | 18 | int (*mmap)(struct device *, struct vm_area_struct *, |
| 19 | void *, dma_addr_t, size_t, struct dma_attrs *attrs); | 19 | void *, dma_addr_t, size_t, struct dma_attrs *attrs); |
| 20 | 20 | ||
| 21 | int (*get_sgtable)(struct device *dev, struct sg_table *sgt, void *, | ||
| 22 | dma_addr_t, size_t, struct dma_attrs *attrs); | ||
| 23 | |||
| 21 | dma_addr_t (*map_page)(struct device *dev, struct page *page, | 24 | dma_addr_t (*map_page)(struct device *dev, struct page *page, |
| 22 | unsigned long offset, size_t size, | 25 | unsigned long offset, size_t size, |
| 23 | enum dma_data_direction dir, | 26 | enum dma_data_direction dir, |