summaryrefslogtreecommitdiffstats
path: root/sound/soc/sh/hac.c
diff options
context:
space:
mode:
authorLiam Girdwood <lg@opensource.wolfsonmicro.com>2008-07-07 16:08:29 +0100
committerJaroslav Kysela <perex@perex.cz>2008-07-10 09:32:46 +0200
commit53640650ffe07f6201ecae0b0dca078b97327247 (patch)
tree353df5a374d8408edf6395ed56809cc28fea6a53 /sound/soc/sh/hac.c
parent1992a6fbd929196aebe95e0e7b04c4da66c3bfec (diff)
downloadop-kernel-dev-53640650ffe07f6201ecae0b0dca078b97327247.zip
op-kernel-dev-53640650ffe07f6201ecae0b0dca078b97327247.tar.gz
ALSA: asoc: sh - 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 SuperH 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/sh/hac.c')
-rw-r--r--sound/soc/sh/hac.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/sh/hac.c b/sound/soc/sh/hac.c
index b7b676b..df7bc34 100644
--- a/sound/soc/sh/hac.c
+++ b/sound/soc/sh/hac.c
@@ -266,7 +266,7 @@ static int hac_hw_params(struct snd_pcm_substream *substream,
#define AC97_FMTS \
SNDRV_PCM_FMTBIT_S16_LE
-struct snd_soc_cpu_dai sh4_hac_dai[] = {
+struct snd_soc_dai sh4_hac_dai[] = {
{
.name = "HAC0",
.id = 0,
OpenPOWER on IntegriCloud