From b3c62d3ba0087aa8ec21347d1278368e3bf7f50c Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Mon, 3 Oct 2011 16:11:52 +0800 Subject: [PATCH] --- yaml --- r: 270735 b: refs/heads/master c: 2e4891a5ec6e7c5147a6803bfdabe4f1c94d6bce h: refs/heads/master i: 270733: 4b29074a475949727097a231f9917ef0db73ade3 270731: 278d2beb42f608755b6c16a01f37d1da18bd83db 270727: cf1975ae14e954f100e3cdf1c26ec33712612a4e 270719: fbdfbbbfa0e544afd022cd89ef0ae63c9aacaf7b v: v3 --- [refs] | 2 +- trunk/sound/soc/samsung/s3c24xx_simtec.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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;