git.codelabs.ch
/
muen
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'regulator/topic/core' into regulator-next
[muen/linux.git]
/
Documentation
/
devicetree
/
bindings
/
regulator
/
regulator.txt
diff --git
a/Documentation/devicetree/bindings/regulator/regulator.txt
b/Documentation/devicetree/bindings/regulator/regulator.txt
index e459226dfac9e721b9921e5c29155fa9dd0d7b27..2babe15b618d91d0f91d141da5bc0a77a37c5c48 100644
(file)
--- a/
Documentation/devicetree/bindings/regulator/regulator.txt
+++ b/
Documentation/devicetree/bindings/regulator/regulator.txt
@@
-115,7
+115,7
@@
regulators (twl_reg1 and twl_reg2),
...
};
- mmc: mmc@0
x0
{
+ mmc: mmc@0 {
...
...
vmmc-supply = <&twl_reg1>;