diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-15 00:01:02 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-15 00:01:02 +0100 |
commit | ecdca043ebe8e3172e0400d0966831e2e60870a0 (patch) | |
tree | c1433e2399f544970e1f9ae7a469dbc9172c8e9f /sound/soc/codecs/wm8994.c | |
parent | Documentation: Fixes a term's translation in Documentation/zh_CN/arm64/memory... (diff) | |
parent | Linux 3.7-rc5 (diff) | |
download | linux-ecdca043ebe8e3172e0400d0966831e2e60870a0.tar.xz linux-ecdca043ebe8e3172e0400d0966831e2e60870a0.zip |
Merge 3.7-rc5 into driver-core-next
Diffstat (limited to 'sound/soc/codecs/wm8994.c')
-rw-r--r-- | sound/soc/codecs/wm8994.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index 3fddc7ad1127..b2b2b37131bd 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c @@ -3722,7 +3722,7 @@ static irqreturn_t wm8958_mic_irq(int irq, void *data) } while (count--); if (count == 0) - dev_warn(codec->dev, "No impedence range reported for jack\n"); + dev_warn(codec->dev, "No impedance range reported for jack\n"); #ifndef CONFIG_SND_SOC_WM8994_MODULE trace_snd_soc_jack_irq(dev_name(codec->dev)); |