summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-04-23 20:26:15 +0200
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-04-23 20:26:15 +0200
commit5cc50fc858a5ab37dc2744d72d7ffed96f23afd8 (patch)
treef39ccc97c9945f08f82081f5330cdf44dec7cea2
parentMerge remote-tracking branch 'asoc/topic/max98088' into asoc-next (diff)
parentASoC: ux500: forward declare msp_i2s_platform_data (diff)
downloadlinux-5cc50fc858a5ab37dc2744d72d7ffed96f23afd8.tar.xz
linux-5cc50fc858a5ab37dc2744d72d7ffed96f23afd8.zip
Merge remote-tracking branch 'asoc/topic/ux500' into asoc-next
-rw-r--r--sound/soc/ux500/ux500_msp_i2s.h1
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 {
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);