diff --git a/[refs] b/[refs] index b70e16d13155..ba31f89681bf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 409203074e9f3c423cdc7c38f984ce24ae261556 +refs/heads/master: d8ed061a9fb2ab1f4bd90b5c30f4dc98b9c2085b diff --git a/trunk/sound/soc/s3c24xx/s3c24xx-i2s.c b/trunk/sound/soc/s3c24xx/s3c24xx-i2s.c index cb68b9ced601..ce935a71099b 100644 --- a/trunk/sound/soc/s3c24xx/s3c24xx-i2s.c +++ b/trunk/sound/soc/s3c24xx/s3c24xx-i2s.c @@ -411,7 +411,7 @@ static int s3c24xx_i2s_probe(struct platform_device *pdev) } #ifdef CONFIG_PM -int s3c24xx_i2s_suspend(struct platform_device *pdev, +static int s3c24xx_i2s_suspend(struct platform_device *pdev, struct snd_soc_cpu_dai *cpu_dai) { DBG("Entered %s\n", __func__); @@ -426,7 +426,7 @@ int s3c24xx_i2s_suspend(struct platform_device *pdev, return 0; } -int s3c24xx_i2s_resume(struct platform_device *pdev, +static int s3c24xx_i2s_resume(struct platform_device *pdev, struct snd_soc_cpu_dai *cpu_dai) { DBG("Entered %s\n", __func__);