aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/imx/imx-ssi.h
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-01-06 17:56:52 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-01-17 11:10:01 +0000
commit48dbc41988d07c7a9ba83afd31543d8ecb2beecc (patch)
tree457d418fcebb96b306e5eb3c9a8cc9d9b99ac785 /sound/soc/imx/imx-ssi.h
parent157a777c8e809bd0c703e3f7617b3539df30feff (diff)
downloadkernel_samsung_smdk4412-48dbc41988d07c7a9ba83afd31543d8ecb2beecc.zip
kernel_samsung_smdk4412-48dbc41988d07c7a9ba83afd31543d8ecb2beecc.tar.gz
kernel_samsung_smdk4412-48dbc41988d07c7a9ba83afd31543d8ecb2beecc.tar.bz2
ASoC: Convert new i.MX SSI driver to use static DAI array
While dynamically allocated DAIs are the way forward the core doesn't yet support anything except matching with a pointer to the actual DAI so convert to doing that so that machine drivers don't have to jump through hoops to register themselves. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Javier Martin <javier.martin@vista-silicon.com>
Diffstat (limited to 'sound/soc/imx/imx-ssi.h')
-rw-r--r--sound/soc/imx/imx-ssi.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/imx/imx-ssi.h b/sound/soc/imx/imx-ssi.h
index cb2c81f..55f26eb 100644
--- a/sound/soc/imx/imx-ssi.h
+++ b/sound/soc/imx/imx-ssi.h
@@ -183,7 +183,7 @@
#define IMX_SSI_RX_DIV_PSR 4
#define IMX_SSI_RX_DIV_PM 5
-extern struct snd_soc_dai *imx_ssi_pcm_dai[2];
+extern struct snd_soc_dai imx_ssi_pcm_dai[2];
extern struct snd_soc_platform imx_soc_platform;
#define DRV_NAME "imx-ssi"
@@ -195,7 +195,6 @@ struct imx_pcm_dma_params {
};
struct imx_ssi {
- struct snd_soc_dai dai;
struct platform_device *ac97_dev;
struct snd_soc_device imx_ac97;