| commit | 5cc50fc858a5ab37dc2744d72d7ffed96f23afd8 | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | Tue Apr 23 19:26:15 2013 +0100 |
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | Tue Apr 23 19:26:15 2013 +0100 |
| tree | f39ccc97c9945f08f82081f5330cdf44dec7cea2 | |
| parent | 5d4dcae70628bf00ed11c09837a6fb6d4d920bb4 [diff] | |
| parent | d74bf3fa8e85f8f80738d93396d8aab3871eae1e [diff] |
Merge remote-tracking branch 'asoc/topic/ux500' into asoc-next
diff --git a/sound/soc/ux500/ux500_msp_i2s.h b/sound/soc/ux500/ux500_msp_i2s.h index 1311c0d..6f3e3dc 100644 --- a/sound/soc/ux500/ux500_msp_i2s.h +++ b/sound/soc/ux500/ux500_msp_i2s.h
@@ -543,6 +543,7 @@ struct stedma40_chan_cfg *dma_cfg; }; +struct msp_i2s_platform_data; int ux500_msp_i2s_init_msp(struct platform_device *pdev, struct ux500_msp **msp_p, struct msp_i2s_platform_data *platform_data);