From ab032dc55c0ea71a24f6a8fc99872e8f5d085760 Mon Sep 17 00:00:00 2001
From: Peter Meerwald <p.meerwald@bct-electronic.com>
Date: Tue, 2 Oct 2012 14:08:19 +0200
Subject: [PATCH] --- yaml --- r: 334463 b: refs/heads/master c:
 a92b078eab17d09ac600446954d8b0d7998c6168 h: refs/heads/master i:   334461:
 2ef4c642204657a670b3f3553d93dbbe5de736b2   334459:
 5e4e3e6c3bacb4d5b66f8879f917beefd0184dfd   334455:
 4bc79ba12ab68dd73003d91e4bbe8f8b4cc54c44   334447:
 c8b861c43059a83cdf0123d7ff74287b12c31f30   334431:
 4dcb8e04ea32c2933d4ee799ebd6b99859c8ea99   334399:
 81eba23f403b2e45b4de3b675c948225bf07797d   334335:
 5a9100354ca3efbcedce883e4211e6ed14ba6df1 v: v3

---
 [refs]                     | 2 +-
 trunk/sound/soc/soc-jack.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 11c30ab8623a..7fca20cfb7e4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ca057410a8ea88ffb3ce6a581377cffa71ac01c6
+refs/heads/master: a92b078eab17d09ac600446954d8b0d7998c6168
diff --git a/trunk/sound/soc/soc-jack.c b/trunk/sound/soc/soc-jack.c
index fa0fd8ddae90..1ab5fe04bfcc 100644
--- a/trunk/sound/soc/soc-jack.c
+++ b/trunk/sound/soc/soc-jack.c
@@ -22,7 +22,7 @@
 
 /**
  * snd_soc_jack_new - Create a new jack
- * @card:  ASoC card
+ * @codec: ASoC codec
  * @id:    an identifying string for this jack
  * @type:  a bitmask of enum snd_jack_type values that can be detected by
  *         this jack
@@ -133,12 +133,13 @@ EXPORT_SYMBOL_GPL(snd_soc_jack_add_zones);
 
 /**
  * snd_soc_jack_get_type - Based on the mic bias value, this function returns
- * the type of jack from the zones delcared in the jack type
+ * the type of jack from the zones declared in the jack type
  *
+ * @jack:  ASoC jack
  * @micbias_voltage:  mic bias voltage at adc channel when jack is plugged in
  *
  * Based on the mic bias value passed, this function helps identify
- * the type of jack from the already delcared jack zones
+ * the type of jack from the already declared jack zones
  */
 int snd_soc_jack_get_type(struct snd_soc_jack *jack, int micbias_voltage)
 {