summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/twl6040.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-02-01 15:55:10 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-02-01 15:55:10 +0100
commit273de37655369e57919f19e157fafb2b4b1e4472 (patch)
treeb1cb751fc91b4a2400577f4137b7bb2a06fb0c53 /sound/soc/codecs/twl6040.c
parentASoC: Use snd_pcm_format_width() in snd_soc_params_to_frame_size() (diff)
parentASoC: omap: rx51: Add earphone support (diff)
downloadlinux-273de37655369e57919f19e157fafb2b4b1e4472.tar.xz
linux-273de37655369e57919f19e157fafb2b4b1e4472.zip
Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6 into for-2.6.39
Diffstat (limited to 'sound/soc/codecs/twl6040.c')
-rw-r--r--sound/soc/codecs/twl6040.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/twl6040.c b/sound/soc/codecs/twl6040.c
index 4bbf1b15a493..482fcdb59bfa 100644
--- a/sound/soc/codecs/twl6040.c
+++ b/sound/soc/codecs/twl6040.c
@@ -724,8 +724,8 @@ static int twl6040_power_mode_event(struct snd_soc_dapm_widget *w,
return 0;
}
-void twl6040_hs_jack_report(struct snd_soc_codec *codec,
- struct snd_soc_jack *jack, int report)
+static void twl6040_hs_jack_report(struct snd_soc_codec *codec,
+ struct snd_soc_jack *jack, int report)
{
struct twl6040_data *priv = snd_soc_codec_get_drvdata(codec);
int status;