diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-07-22 08:43:19 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-07-22 08:43:19 +0200 |
| commit | 13b137ef0367237909bb2dc38babfb8305154676 (patch) | |
| tree | a5d756fcc6603da970ef8c5e263244c6166a2fba /sound/soc/mid-x86/sst_platform.c | |
| parent | e8fd86efaa09445ca1afc1aea08d4666c966ed03 (diff) | |
| parent | 440085598672c0e3fde8a48495f61fea418b06d1 (diff) | |
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'sound/soc/mid-x86/sst_platform.c')
| -rw-r--r-- | sound/soc/mid-x86/sst_platform.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/mid-x86/sst_platform.c b/sound/soc/mid-x86/sst_platform.c index 5a946b4115a2..3e7826058efe 100644 --- a/sound/soc/mid-x86/sst_platform.c +++ b/sound/soc/mid-x86/sst_platform.c @@ -402,9 +402,10 @@ static void sst_pcm_free(struct snd_pcm *pcm) snd_pcm_lib_preallocate_free_for_all(pcm); } -int sst_pcm_new(struct snd_card *card, struct snd_soc_dai *dai, - struct snd_pcm *pcm) +int sst_pcm_new(struct snd_soc_pcm_runtime *rtd) { + struct snd_soc_dai *dai = rtd->cpu_dai; + struct snd_pcm *pcm = rtd->pcm; int retval = 0; pr_debug("sst_pcm_new called\n"); |