diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-03-08 17:49:24 +0100 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-03-08 17:49:24 +0100 |
| commit | 9446389ef612096704fdf18fa79bab423d4110f0 (patch) | |
| tree | 3e4fda7270be58ae176d20d318e61fb115b325b5 /sound/soc/pxa/spitz.c | |
| parent | Merge branch 'cleanups' into next (diff) | |
| parent | x86_64: make ptrace always sign-extend orig_ax to 64 bits (diff) | |
| download | linux-9446389ef612096704fdf18fa79bab423d4110f0.tar.xz linux-9446389ef612096704fdf18fa79bab423d4110f0.zip | |
Merge commit 'origin' into devel
Diffstat (limited to 'sound/soc/pxa/spitz.c')
| -rw-r--r-- | sound/soc/pxa/spitz.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/pxa/spitz.c b/sound/soc/pxa/spitz.c index d56709e15435..ecca39033fcc 100644 --- a/sound/soc/pxa/spitz.c +++ b/sound/soc/pxa/spitz.c @@ -215,7 +215,8 @@ static int spitz_set_spk(struct snd_kcontrol *kcontrol, return 1; } -static int spitz_mic_bias(struct snd_soc_dapm_widget *w, int event) +static int spitz_mic_bias(struct snd_soc_dapm_widget *w, + struct snd_kcontrol *k, int event) { if (machine_is_borzoi() || machine_is_spitz()) { if (SND_SOC_DAPM_EVENT_ON(event)) |