diff options
| author | Liam Girdwood <lg@opensource.wolfsonmicro.com> | 2008-07-07 16:07:42 +0100 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2008-07-10 09:32:37 +0200 |
| commit | 9cb132d743cf39b3bbe4288e9035217e7237a0bb (patch) | |
| tree | 6afa0bf419181ebf8fda2d6d26eddcbd58cabe24 /sound/soc/davinci/davinci-pcm.c | |
| parent | d37ae539a1d76da8fe5a939ce8b6d818501c8716 (diff) | |
ALSA: asoc: davinci - 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 DaVinci 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/davinci/davinci-pcm.c')
| -rw-r--r-- | sound/soc/davinci/davinci-pcm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/davinci/davinci-pcm.c b/sound/soc/davinci/davinci-pcm.c index 6a76927c997..6a5e56a782b 100644 --- a/sound/soc/davinci/davinci-pcm.c +++ b/sound/soc/davinci/davinci-pcm.c @@ -350,7 +350,7 @@ static void davinci_pcm_free(struct snd_pcm *pcm) static u64 davinci_pcm_dmamask = 0xffffffff; static int davinci_pcm_new(struct snd_card *card, - struct snd_soc_codec_dai *dai, struct snd_pcm *pcm) + struct snd_soc_dai *dai, struct snd_pcm *pcm) { int ret; |