From 9a6150144e4d6eb07d02e877595c9c2a4c7ab7ec Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Thu, 29 Mar 2012 12:21:17 +0800 Subject: [PATCH] --- yaml --- r: 298587 b: refs/heads/master c: 15c08f664d8ca4f4d0e202cbd4034422a706ef80 h: refs/heads/master i: 298585: a92fee6b3cf03a86d4d1ae0f5b04157707d322ff 298583: 5b3e1191d6e6e825373a6bc301c9d53476b040fb v: v3 --- [refs] | 2 +- trunk/include/linux/regulator/machine.h | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 5413260879df..64a602a3ced4 100644 --- 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 index 7abb16093312..b02108446be7 100644 --- 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.