diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-23 14:26:15 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-23 14:26:15 -0400 |
| commit | 5cc50fc858a5ab37dc2744d72d7ffed96f23afd8 (patch) | |
| tree | f39ccc97c9945f08f82081f5330cdf44dec7cea2 /sound/soc/ux500 | |
| parent | 5d4dcae70628bf00ed11c09837a6fb6d4d920bb4 (diff) | |
| parent | d74bf3fa8e85f8f80738d93396d8aab3871eae1e (diff) | |
Merge remote-tracking branch 'asoc/topic/ux500' into asoc-next
Diffstat (limited to 'sound/soc/ux500')
| -rw-r--r-- | sound/soc/ux500/ux500_msp_i2s.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/ux500/ux500_msp_i2s.h b/sound/soc/ux500/ux500_msp_i2s.h index 1311c0df7628..6f3e3dccbcb6 100644 --- a/sound/soc/ux500/ux500_msp_i2s.h +++ b/sound/soc/ux500/ux500_msp_i2s.h | |||
| @@ -543,6 +543,7 @@ struct ux500_msp_dma_params { | |||
| 543 | struct stedma40_chan_cfg *dma_cfg; | 543 | struct stedma40_chan_cfg *dma_cfg; |
| 544 | }; | 544 | }; |
| 545 | 545 | ||
| 546 | struct msp_i2s_platform_data; | ||
| 546 | int ux500_msp_i2s_init_msp(struct platform_device *pdev, | 547 | int ux500_msp_i2s_init_msp(struct platform_device *pdev, |
| 547 | struct ux500_msp **msp_p, | 548 | struct ux500_msp **msp_p, |
| 548 | struct msp_i2s_platform_data *platform_data); | 549 | struct msp_i2s_platform_data *platform_data); |