diff options
| author | Liam Girdwood <lg@opensource.wolfsonmicro.com> | 2008-07-07 11:07:52 -0400 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2008-07-10 03:32:39 -0400 |
| commit | e550e17ffeb8cf8db27724eaf2ad05f77388afb9 (patch) | |
| tree | 0c73c0d1e42ce77b049f8d4c39ce1937f5256eca /sound/soc/codecs/tlv320aic3x.h | |
| parent | 9cb132d743cf39b3bbe4288e9035217e7237a0bb (diff) | |
ALSA: asoc: codecs - 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 codec drivers.
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/codecs/tlv320aic3x.h')
| -rw-r--r-- | sound/soc/codecs/tlv320aic3x.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/tlv320aic3x.h b/sound/soc/codecs/tlv320aic3x.h index e6009461063f..d76c079b86e7 100644 --- a/sound/soc/codecs/tlv320aic3x.h +++ b/sound/soc/codecs/tlv320aic3x.h | |||
| @@ -228,7 +228,7 @@ struct aic3x_setup_data { | |||
| 228 | unsigned int gpio_func[2]; | 228 | unsigned int gpio_func[2]; |
| 229 | }; | 229 | }; |
| 230 | 230 | ||
| 231 | extern struct snd_soc_codec_dai aic3x_dai; | 231 | extern struct snd_soc_dai aic3x_dai; |
| 232 | extern struct snd_soc_codec_device soc_codec_dev_aic3x; | 232 | extern struct snd_soc_codec_device soc_codec_dev_aic3x; |
| 233 | 233 | ||
| 234 | #endif /* _AIC3X_H */ | 234 | #endif /* _AIC3X_H */ |