diff options
| author | Liam Girdwood <lg@opensource.wolfsonmicro.com> | 2008-07-07 16:08:11 +0100 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2008-07-10 09:32:43 +0200 |
| commit | 917f93ac80a1c007d4a3ce269a3712f93a75728f (patch) | |
| tree | b094def3f56cb87e6f6a6b38449b291f68171feb /sound/soc/pxa/pxa2xx-pcm.c | |
| parent | 8687eb8bded8c3c5842a85bd0c30e43fc5a3e0e0 (diff) | |
| download | talos-op-linux-917f93ac80a1c007d4a3ce269a3712f93a75728f.tar.gz talos-op-linux-917f93ac80a1c007d4a3ce269a3712f93a75728f.zip | |
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-pcm.c')
| -rw-r--r-- | sound/soc/pxa/pxa2xx-pcm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/pxa/pxa2xx-pcm.c b/sound/soc/pxa/pxa2xx-pcm.c index 01ad7bf716b7..2df03ee5819e 100644 --- a/sound/soc/pxa/pxa2xx-pcm.c +++ b/sound/soc/pxa/pxa2xx-pcm.c @@ -330,7 +330,7 @@ static void pxa2xx_pcm_free_dma_buffers(struct snd_pcm *pcm) static u64 pxa2xx_pcm_dmamask = DMA_32BIT_MASK; -int pxa2xx_pcm_new(struct snd_card *card, struct snd_soc_codec_dai *dai, +int pxa2xx_pcm_new(struct snd_card *card, struct snd_soc_dai *dai, struct snd_pcm *pcm) { int ret = 0; |
