]> Pileus Git - ~andy/linux/commitdiff
Merge remote-tracking branch 'regulator/fix/doc' into regulator-linus
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 30 May 2013 10:58:39 +0000 (11:58 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 30 May 2013 10:58:39 +0000 (11:58 +0100)
1  2 
drivers/regulator/core.c

diff --combined drivers/regulator/core.c
index 5e50b20f0f9668ef4f790ae96f6e7b074129aeca,014c92a5434d3fa151b6b03e2b4c5a4d341f3c3a..815d6df8bd5f70fab479247c81c6afe7fa746841
@@@ -1539,7 -1539,10 +1539,10 @@@ static void regulator_ena_gpio_free(str
  }
  
  /**
-  * Balance enable_count of each GPIO and actual GPIO pin control.
+  * regulator_ena_gpio_ctrl - balance enable_count of each GPIO and actual GPIO pin control
+  * @rdev: regulator_dev structure
+  * @enable: enable GPIO at initial use?
+  *
   * GPIO is enabled in case of initial use. (enable_count is 0)
   * GPIO is disabled when it is not shared any more. (enable_count <= 1)
   */
@@@ -2702,7 -2705,7 +2705,7 @@@ EXPORT_SYMBOL_GPL(regulator_get_voltage
  /**
   * regulator_set_current_limit - set regulator output current limit
   * @regulator: regulator source
 - * @min_uA: Minimuum supported current in uA
 + * @min_uA: Minimum supported current in uA
   * @max_uA: Maximum supported current in uA
   *
   * Sets current sink to the desired output current. This can be set during