diff options
author | Liam Girdwood <lg@opensource.wolfsonmicro.com> | 2008-07-07 11:08:29 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@perex.cz> | 2008-07-10 03:32:46 -0400 |
commit | 53640650ffe07f6201ecae0b0dca078b97327247 (patch) | |
tree | 353df5a374d8408edf6395ed56809cc28fea6a53 /sound/soc/sh/hac.c | |
parent | 1992a6fbd929196aebe95e0e7b04c4da66c3bfec (diff) |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/sh/hac.c b/sound/soc/sh/hac.c index b7b676b3d671..df7bc345c320 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, | |||
266 | #define AC97_FMTS \ | 266 | #define AC97_FMTS \ |
267 | SNDRV_PCM_FMTBIT_S16_LE | 267 | SNDRV_PCM_FMTBIT_S16_LE |
268 | 268 | ||
269 | struct snd_soc_cpu_dai sh4_hac_dai[] = { | 269 | struct snd_soc_dai sh4_hac_dai[] = { |
270 | { | 270 | { |
271 | .name = "HAC0", | 271 | .name = "HAC0", |
272 | .id = 0, | 272 | .id = 0, |