diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-05-11 08:57:22 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-05-11 08:57:22 +0200 |
| commit | ae73e7784871ebe2c43da619b4a1e2c9ff81508d (patch) | |
| tree | 724238ba2877c672e4a61d46ec11f48d2d560936 /include/linux/platform_device.h | |
| parent | staging: vt6656: Use const for read only data (diff) | |
| parent | Linux 5.7-rc5 (diff) | |
Merge 5.7-rc5 into staging-next
We need the staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/platform_device.h')
| -rw-r--r-- | include/linux/platform_device.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/platform_device.h b/include/linux/platform_device.h index bdc35753ef7c..77a2aada106d 100644 --- a/include/linux/platform_device.h +++ b/include/linux/platform_device.h @@ -25,6 +25,7 @@ struct platform_device { bool id_auto; struct device dev; u64 platform_dma_mask; + struct device_dma_parameters dma_parms; u32 num_resources; struct resource *resource; |