diff options
author | Liam Girdwood <lg@opensource.wolfsonmicro.com> | 2008-07-07 11:08:00 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@perex.cz> | 2008-07-10 03:32:40 -0400 |
commit | 8cf7b2b393b26b9ba1ccbeeb271a88e51d58f3e3 (patch) | |
tree | 4c3c917857fc4a87f6a8f9eb8d036b4cb818e50c /sound/soc/fsl/fsl_ssi.h | |
parent | e550e17ffeb8cf8db27724eaf2ad05f77388afb9 (diff) |
ALSA: asoc: fsl - merge structs snd_soc_codec_dai and snd_soc_cpu_dai.
This patch merges struct snd_soc_codec_dai and struct
snd_soc_cpu_dai into struct snd_soc_dai for the Freescale PPC platform.
Signed-off-by: Liam Girdwood <lg@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/soc/fsl/fsl_ssi.h')
-rw-r--r-- | sound/soc/fsl/fsl_ssi.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/fsl/fsl_ssi.h b/sound/soc/fsl/fsl_ssi.h index c5ce88e1565..83b44d700e3 100644 --- a/sound/soc/fsl/fsl_ssi.h +++ b/sound/soc/fsl/fsl_ssi.h | |||
@@ -217,8 +217,8 @@ struct fsl_ssi_info { | |||
217 | struct device *dev; | 217 | struct device *dev; |
218 | }; | 218 | }; |
219 | 219 | ||
220 | struct snd_soc_cpu_dai *fsl_ssi_create_dai(struct fsl_ssi_info *ssi_info); | 220 | struct snd_soc_dai *fsl_ssi_create_dai(struct fsl_ssi_info *ssi_info); |
221 | void fsl_ssi_destroy_dai(struct snd_soc_cpu_dai *fsl_ssi_dai); | 221 | void fsl_ssi_destroy_dai(struct snd_soc_dai *fsl_ssi_dai); |
222 | 222 | ||
223 | #endif | 223 | #endif |
224 | 224 | ||