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/sh7760-ac97.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/sh7760-ac97.c')
| -rw-r--r-- | sound/soc/sh/sh7760-ac97.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/sh/sh7760-ac97.c b/sound/soc/sh/sh7760-ac97.c index 846d1b3a6305..92bfaf4774a7 100644 --- a/sound/soc/sh/sh7760-ac97.c +++ b/sound/soc/sh/sh7760-ac97.c | |||
| @@ -20,7 +20,7 @@ | |||
| 20 | #define IPSEL 0xFE400034 | 20 | #define IPSEL 0xFE400034 |
| 21 | 21 | ||
| 22 | /* platform specific structs can be declared here */ | 22 | /* platform specific structs can be declared here */ |
| 23 | extern struct snd_soc_cpu_dai sh4_hac_dai[2]; | 23 | extern struct snd_soc_dai sh4_hac_dai[2]; |
| 24 | extern struct snd_soc_platform sh7760_soc_platform; | 24 | extern struct snd_soc_platform sh7760_soc_platform; |
| 25 | 25 | ||
| 26 | static int machine_init(struct snd_soc_codec *codec) | 26 | static int machine_init(struct snd_soc_codec *codec) |