diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-10 20:56:08 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-10 20:56:08 (GMT) |
| commit | 754c780953397dd5ee5191b7b3ca67e09088ce7a (patch) | |
| tree | 8bdbf8407c8cd917f24a0d5a5c6a865db6366f3c /drivers/media/pci/cx23885/cx23885-f300.c | |
| parent | 40c43269cf8e88a0bdc306c717d1dd5446a6f3b8 (diff) | |
| parent | b4bbb107d73bbc0d92c9ae7fd8e69580aa9381e7 (diff) | |
| download | linux-754c780953397dd5ee5191b7b3ca67e09088ce7a.tar.xz | |
Merge branch 'for-v3.18' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
Pull dma-mapping update from Marek Szyprowski:
"Provide the dma write coherent api (available previously on ARM
architecture) for all other architectures, which use dma_ops-based dma
mapping implementation.
This lets one to use the same code in the device drivers regardless of
the selected architecture"
* 'for-v3.18' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
dma-mapping: Provide write-combine allocations
s390: Implement dma_{alloc,free}_attrs()
Diffstat (limited to 'drivers/media/pci/cx23885/cx23885-f300.c')
0 files changed, 0 insertions, 0 deletions