summaryrefslogtreecommitdiffstats
path: root/Documentation/power/regulator/consumer.txt
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-12-12 02:12:17 +0100
committerDavid S. Miller <davem@davemloft.net>2009-12-12 02:12:17 +0100
commit501706565b2d4d2d40d0d301d5411ede099b8a6f (patch)
tree142a18bf1f1e74a09dbfa27540b893ade0fd797d /Documentation/power/regulator/consumer.txt
parentnet: Handle NETREG_UNINITIALIZED devices correctly (diff)
parentMerge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cp... (diff)
downloadlinux-501706565b2d4d2d40d0d301d5411ede099b8a6f.tar.xz
linux-501706565b2d4d2d40d0d301d5411ede099b8a6f.zip
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts: include/net/tcp.h
Diffstat (limited to 'Documentation/power/regulator/consumer.txt')
-rw-r--r--Documentation/power/regulator/consumer.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/power/regulator/consumer.txt b/Documentation/power/regulator/consumer.txt
index 5f83fd24ea84..cdebb5145c25 100644
--- a/Documentation/power/regulator/consumer.txt
+++ b/Documentation/power/regulator/consumer.txt
@@ -104,7 +104,7 @@ to set the limit to 500mA when supplying power.
Consumers can control their supply current limit by calling :-
-int regulator_set_current_limit(regulator, min_uV, max_uV);
+int regulator_set_current_limit(regulator, min_uA, max_uA);
Where min_uA and max_uA are the minimum and maximum acceptable current limit in
microamps.