diff options
| author | Mark Brown <broonie@linaro.org> | 2013-07-04 11:14:12 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-07-04 11:14:12 +0100 |
| commit | 8d0509e9d6e1303acb40f53f5158fceec46e86e7 (patch) | |
| tree | f438392c0af2159808359bf7f02c4057f56bf84f /Documentation | |
| parent | 6febb5abc597849b3fe918cc69432dc9cf5ab025 (diff) | |
| parent | 489cceeeb808199f55dbff2adaddd7394fb88de6 (diff) | |
| download | op-kernel-dev-8d0509e9d6e1303acb40f53f5158fceec46e86e7.zip op-kernel-dev-8d0509e9d6e1303acb40f53f5158fceec46e86e7.tar.gz | |
Merge remote-tracking branch 'regulator/fix/max8997' into regulator-linus
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/regulator/max8997-regulator.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/regulator/max8997-regulator.txt b/Documentation/devicetree/bindings/regulator/max8997-regulator.txt index 9e5e51d..5c186a7 100644 --- a/Documentation/devicetree/bindings/regulator/max8997-regulator.txt +++ b/Documentation/devicetree/bindings/regulator/max8997-regulator.txt @@ -1,6 +1,6 @@ * Maxim MAX8997 Voltage and Current Regulator -The Maxim MAX8997 is a multi-function device which includes volatage and +The Maxim MAX8997 is a multi-function device which includes voltage and current regulators, rtc, charger controller and other sub-blocks. It is interfaced to the host controller using a i2c interface. Each sub-block is addressed by the host system using different i2c slave address. This document |
