diff options
| author |   Russell King <rmk+kernel@arm.linux.org.uk> | 2014-06-05 12:36:22 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-06-05 12:36:22 +0100 |
| commit | bd63ce27d9d62bc40a962b991cbbbe4f0dc913d2 (patch) | |
| tree | bd998b187b7ea4e9f28c0c61912b701bc6ff6420 /include/linux/device.h | |
| parent | Merge branches 'alignment', 'fixes', 'l2c' (early part) and 'misc' into for-next (diff) | |
| parent | Merge tag 'dt-dma-properties-for-arm' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into devel-stable (diff) | |
| download | linux-dev-bd63ce27d9d62bc40a962b991cbbbe4f0dc913d2.tar.xz linux-dev-bd63ce27d9d62bc40a962b991cbbbe4f0dc913d2.zip | |
Merge branch 'devel-stable' into for-next
Diffstat (limited to 'include/linux/device.h')
| -rw-r--r-- | include/linux/device.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index d1d1c055b48e..460ebad15109 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -685,6 +685,7 @@ struct acpi_dev_node { * @coherent_dma_mask: Like dma_mask, but for alloc_coherent mapping as not all * hardware supports 64-bit addresses for consistent allocations * such descriptors. + * @dma_pfn_offset: offset of DMA memory range relatively of RAM * @dma_parms: A low level driver may set these to teach IOMMU code about * segment limitations. * @dma_pools: Dma pools (if dma'ble device). @@ -750,6 +751,7 @@ struct device { not all hardware supports 64 bit addresses for consistent allocations such descriptors. */ + unsigned long dma_pfn_offset; struct device_dma_parameters *dma_parms; |