diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-03-03 05:31:09 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-03-03 05:31:09 -0500 |
| commit | 3cecdda3f169f22f324f78fd544beee68e3cc6a4 (patch) | |
| tree | e7c2995ddc2690d1be695a1525bcd16d3965548d /sound/soc/pxa/tosa.c | |
| parent | b9c64498f53e0f4d90eec03048f73ac215bb6f79 (diff) | |
| parent | da40451bba23b51eaca4170a095891646ce72104 (diff) | |
Merge branch 'for-2.6.25' of master.kernel.org:/pub/scm/linux/kernel/git/arnd/cell-2.6 into merge
Diffstat (limited to 'sound/soc/pxa/tosa.c')
| -rw-r--r-- | sound/soc/pxa/tosa.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/pxa/tosa.c b/sound/soc/pxa/tosa.c index e4d40b528ca4..7346d7e5d066 100644 --- a/sound/soc/pxa/tosa.c +++ b/sound/soc/pxa/tosa.c | |||
| @@ -135,7 +135,8 @@ static int tosa_set_spk(struct snd_kcontrol *kcontrol, | |||
| 135 | } | 135 | } |
| 136 | 136 | ||
| 137 | /* tosa dapm event handlers */ | 137 | /* tosa dapm event handlers */ |
| 138 | static int tosa_hp_event(struct snd_soc_dapm_widget *w, int event) | 138 | static int tosa_hp_event(struct snd_soc_dapm_widget *w, |
| 139 | struct snd_kcontrol *k, int event) | ||
| 139 | { | 140 | { |
| 140 | if (SND_SOC_DAPM_EVENT_ON(event)) | 141 | if (SND_SOC_DAPM_EVENT_ON(event)) |
| 141 | set_tc6393_gpio(&tc6393_device.dev,TOSA_TC6393_L_MUTE); | 142 | set_tc6393_gpio(&tc6393_device.dev,TOSA_TC6393_L_MUTE); |