Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6

[~andy/linux] / sound / soc / samsung / s3c24xx_simtec.c

diff --git a/sound/soc/samsung/s3c24xx_simtec.c b/sound/soc/samsung/s3c24xx_simtec.c
index 349566f0686b7a234aa2db7ef767a712dbc7d603..a253bcc1646aabee42c7b4844bcf960578f49b1b 100644 (file)
--- a/sound/soc/samsung/s3c24xx_simtec.c
+++ b/sound/soc/samsung/s3c24xx_simtec.c
@@ -9,6 +9,7 @@
 
 #include <linux/gpio.h>
 #include <linux/clk.h>
+#include <linux/module.h>
 
 #include <sound/soc.h>
 
@@ -300,7 +301,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;