aboutsummaryrefslogtreecommitdiff
path: root/sound/soc/pxa/pxa2xx-i2s.h
diff options
context:
space:
mode:
authorLiam Girdwood <lg@opensource.wolfsonmicro.com>2008-07-07 16:08:11 +0100
committerJaroslav Kysela <perex@perex.cz>2008-07-10 09:32:43 +0200
commit917f93ac80a1c007d4a3ce269a3712f93a75728f (patch)
treeb094def3f56cb87e6f6a6b38449b291f68171feb /sound/soc/pxa/pxa2xx-i2s.h
parent8687eb8bded8c3c5842a85bd0c30e43fc5a3e0e0 (diff)
ALSA: asoc: pxa - 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 PXA 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/pxa/pxa2xx-i2s.h')
-rw-r--r--sound/soc/pxa/pxa2xx-i2s.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/pxa/pxa2xx-i2s.h b/sound/soc/pxa/pxa2xx-i2s.h
index 4435bd9f884..e2def441153 100644
--- a/sound/soc/pxa/pxa2xx-i2s.h
+++ b/sound/soc/pxa/pxa2xx-i2s.h
@@ -15,6 +15,6 @@
/* I2S clock */
#define PXA2XX_I2S_SYSCLK 0
-extern struct snd_soc_cpu_dai pxa_i2s_dai;
+extern struct snd_soc_dai pxa_i2s_dai;
#endif