summaryrefslogtreecommitdiffstats
path: root/sound/soc/davinci/davinci-i2s.h
diff options
context:
space:
mode:
authorLiam Girdwood <lg@opensource.wolfsonmicro.com>2008-07-07 16:07:42 +0100
committerJaroslav Kysela <perex@perex.cz>2008-07-10 09:32:37 +0200
commit9cb132d743cf39b3bbe4288e9035217e7237a0bb (patch)
tree6afa0bf419181ebf8fda2d6d26eddcbd58cabe24 /sound/soc/davinci/davinci-i2s.h
parentd37ae539a1d76da8fe5a939ce8b6d818501c8716 (diff)
downloadlinux-stable-9cb132d743cf39b3bbe4288e9035217e7237a0bb.tar.gz
linux-stable-9cb132d743cf39b3bbe4288e9035217e7237a0bb.tar.bz2
linux-stable-9cb132d743cf39b3bbe4288e9035217e7237a0bb.zip
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-i2s.h')
-rw-r--r--sound/soc/davinci/davinci-i2s.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/davinci/davinci-i2s.h b/sound/soc/davinci/davinci-i2s.h
index 9592d17db320..c5b091807eec 100644
--- a/sound/soc/davinci/davinci-i2s.h
+++ b/sound/soc/davinci/davinci-i2s.h
@@ -12,6 +12,6 @@
#ifndef _DAVINCI_I2S_H
#define _DAVINCI_I2S_H
-extern struct snd_soc_cpu_dai davinci_i2s_dai;
+extern struct snd_soc_dai davinci_i2s_dai;
#endif