diff --git a/[refs] b/[refs]
index a775e9f85411..1ae46847b2d9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 43419b80fa46ee94d4b50ac6ebb1ee1ca5bbbcc7
+refs/heads/master: 2e4891a5ec6e7c5147a6803bfdabe4f1c94d6bce
diff --git a/trunk/sound/soc/samsung/s3c24xx_simtec.c b/trunk/sound/soc/samsung/s3c24xx_simtec.c
index 349566f0686b..c8d525bf6122 100644
--- a/trunk/sound/soc/samsung/s3c24xx_simtec.c
+++ b/trunk/sound/soc/samsung/s3c24xx_simtec.c
@@ -300,7 +300,7 @@ static void detach_gpio_amp(struct s3c24xx_audio_simtec_pdata *pd)
 }
 
 #ifdef CONFIG_PM
-int simtec_audio_resume(struct device *dev)
+static int simtec_audio_resume(struct device *dev)
 {
 	simtec_call_startup(pdata);
 	return 0;