summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2008-12-01 20:03:54 +0100
committerTakashi Iwai <tiwai@suse.de>2008-12-01 20:08:22 +0100
commit682d5874f3d654b5d13d9b8dd56b9e05cfadd01b (patch)
tree5e6c53842caa9c0ad84554820de59402a3d0bd35 /sound/soc
parent5220ed6b321639d68a66bad2082456c1b273f3ea (diff)
downloadblackbird-op-linux-682d5874f3d654b5d13d9b8dd56b9e05cfadd01b.tar.gz
blackbird-op-linux-682d5874f3d654b5d13d9b8dd56b9e05cfadd01b.zip
ALSA: ASoC: Fix old-style trigger callback in s3c2443-ac97.c
Fix the old-style trigger callback in s3c2443-ac97.c: sound/soc/s3c24xx/s3c2443-ac97.c:378: warning: initialization from incompatible pointer type Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/s3c24xx/s3c2443-ac97.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/s3c24xx/s3c2443-ac97.c b/sound/soc/s3c24xx/s3c2443-ac97.c
index 41bde6a3883b..f0bc9b7e0840 100644
--- a/sound/soc/s3c24xx/s3c2443-ac97.c
+++ b/sound/soc/s3c24xx/s3c2443-ac97.c
@@ -285,7 +285,8 @@ static int s3c2443_ac97_hw_params(struct snd_pcm_substream *substream,
return 0;
}
-static int s3c2443_ac97_trigger(struct snd_pcm_substream *substream, int cmd)
+static int s3c2443_ac97_trigger(struct snd_pcm_substream *substream, int cmd,
+ struct snd_soc_dai *dai)
{
u32 ac_glbctrl;
OpenPOWER on IntegriCloud