git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
[pandora-kernel.git]
/
sound
/
soc
/
omap
/
ams-delta.c
diff --git
a/sound/soc/omap/ams-delta.c
b/sound/soc/omap/ams-delta.c
index
77682aa
..
30fe0d0
100644
(file)
--- a/
sound/soc/omap/ams-delta.c
+++ b/
sound/soc/omap/ams-delta.c
@@
-427,7
+427,8
@@
static struct snd_soc_ops ams_delta_ops = {
/* Board specific codec bias level control */
static int ams_delta_set_bias_level(struct snd_soc_card *card,
/* Board specific codec bias level control */
static int ams_delta_set_bias_level(struct snd_soc_card *card,
- enum snd_soc_bias_level level)
+ struct snd_soc_dapm_context *dapm,
+ enum snd_soc_bias_level level)
{
struct snd_soc_codec *codec = card->rtd->codec;
{
struct snd_soc_codec *codec = card->rtd->codec;