diff options
| author | Mark Brown <broonie@kernel.org> | 2016-01-05 18:06:29 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-01-05 18:06:29 +0000 |
| commit | ee1e4e3f0d50aebdc6dac2a2cd4ae203ed2a75c1 (patch) | |
| tree | 3ae1d5d33402f3459a65fe492c97d75c168bb04c /include/linux/platform_data/edma.h | |
| parent | 55fc205600ff3b529631cfe03b58645e3844bd92 (diff) | |
| parent | d8018361b58bb7b9a2a657104e54c33c2ef1439d (diff) | |
Merge branch 'fix/intel' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-intel
Diffstat (limited to 'include/linux/platform_data/edma.h')
| -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]; |