diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2015-12-10 04:13:43 +0100 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2015-12-10 04:13:43 +0100 |
| commit | bcb4b619116569d071b26c6f33506459a560ab6a (patch) | |
| tree | f1f5cbba5077d7fcc46521163ad547de1f6c0237 /include | |
| parent | dmaengine: mic_x100: add missing spin_unlock (diff) | |
| parent | dmaengine: edma: DT: Change reserved slot array from 16bit to 32bit type (diff) | |
| download | linux-bcb4b619116569d071b26c6f33506459a560ab6a.tar.xz linux-bcb4b619116569d071b26c6f33506459a560ab6a.zip | |
Merge branch 'fix/edma' into fixes
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/platform_data/edma.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/platform_data/edma.h b/include/linux/platform_data/edma.h index e2878baeb90e..4299f4ba03bd 100644 --- a/include/linux/platform_data/edma.h +++ b/include/linux/platform_data/edma.h @@ -72,7 +72,7 @@ struct edma_soc_info { struct edma_rsv_info *rsv; /* List of channels allocated for memcpy, terminated with -1 */ - s16 *memcpy_channels; + s32 *memcpy_channels; s8 (*queue_priority_mapping)[2]; const s16 (*xbar_chans)[2]; |