---

yaml --- r: 298587 b: refs/heads/master c: 15c08f6 h: refs/heads/master i: 298585: a92fee6 298583: 5b3e119 v: v3
git-mirror · Mar 29, 2012 · 9a61501 · 9a61501
1 parent 7975fa4
commit 9a61501
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cee1a799eb044657922c4d63003d7bf71f8c8b8d
+refs/heads/master: 15c08f664d8ca4f4d0e202cbd4034422a706ef80
diff --git a/trunk/include/linux/regulator/machine.h b/trunk/include/linux/regulator/machine.h
@@ -71,7 +71,7 @@ struct regulator_state {
  * @uV_offset: Offset applied to voltages from consumer to compensate for
  *             voltage drops.
  *
- * @min_uA: Smallest consumers consumers may set.
+ * @min_uA: Smallest current consumers may set.
  * @max_uA: Largest current consumers may set.
  *
  * @valid_modes_mask: Mask of modes which may be configured by consumers.
@@ -134,10 +134,8 @@ struct regulation_constraints {
 /**
  * struct regulator_consumer_supply - supply -> device mapping
  *
- * This maps a supply name to a device.  Only one of dev or dev_name
- * can be specified.  Use of dev_name allows support for buses which
- * make struct device available late such as I2C and is the preferred
- * form.
+ * This maps a supply name to a device. Use of dev_name allows support for
+ * buses which make struct device available late such as I2C.
  *
  * @dev_name: Result of dev_name() for the consumer.
  * @supply: Name for the supply.