projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-3.2' into for-3.3
[deliverable/linux.git]
/
sound
/
soc
/
codecs
/
wm8985.c
diff --git
a/sound/soc/codecs/wm8985.c
b/sound/soc/codecs/wm8985.c
index 9e4481bb122322d51052158d7324e4acc1e2a888..c0c86b3c6adf69076be221308d0fe0fcc48a1c08 100644
(file)
--- a/
sound/soc/codecs/wm8985.c
+++ b/
sound/soc/codecs/wm8985.c
@@
-945,7
+945,7
@@
static int wm8985_set_bias_level(struct snd_soc_codec *codec,
}
#ifdef CONFIG_PM
-static int wm8985_suspend(struct snd_soc_codec *codec
, pm_message_t state
)
+static int wm8985_suspend(struct snd_soc_codec *codec)
{
wm8985_set_bias_level(codec, SND_SOC_BIAS_OFF);
return 0;
This page took
0.027755 seconds
and
5
git commands to generate.