summaryrefslogtreecommitdiff
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-04-23 19:26:15 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-04-23 19:26:15 +0100
commit5cc50fc858a5ab37dc2744d72d7ffed96f23afd8 (patch)
treef39ccc97c9945f08f82081f5330cdf44dec7cea2 /sound/soc
parent5d4dcae70628bf00ed11c09837a6fb6d4d920bb4 (diff)
parentd74bf3fa8e85f8f80738d93396d8aab3871eae1e (diff)
downloadlinux-3.10-5cc50fc858a5ab37dc2744d72d7ffed96f23afd8.tar.gz
linux-3.10-5cc50fc858a5ab37dc2744d72d7ffed96f23afd8.tar.bz2
linux-3.10-5cc50fc858a5ab37dc2744d72d7ffed96f23afd8.zip
Merge remote-tracking branch 'asoc/topic/ux500' into asoc-next
Diffstat (limited to 'sound/soc')
-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 1311c0df762..6f3e3dccbcb 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);