diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-12-06 23:37:06 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-12-06 23:37:06 +0100 |
commit | d0300e5e8d2fb74852f8116f26546e12cfa66735 (patch) | |
tree | a6580aa74a0ebd7965dbc37767717b4f73dd9d79 /Documentation/devicetree/bindings/mfd/max77686.txt | |
parent | Merge tag 'perf-core-for-mingo-4.16-20171206' of git://git.kernel.org/pub/scm... (diff) | |
parent | tooling/headers: Synchronize updated s390 and x86 UAPI headers (diff) | |
download | linux-d0300e5e8d2fb74852f8116f26546e12cfa66735.tar.xz linux-d0300e5e8d2fb74852f8116f26546e12cfa66735.zip |
Merge branch 'perf/urgent' into perf/core, to pick up fixes and to refresh to v4.15
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'Documentation/devicetree/bindings/mfd/max77686.txt')
-rw-r--r-- | Documentation/devicetree/bindings/mfd/max77686.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/mfd/max77686.txt b/Documentation/devicetree/bindings/mfd/max77686.txt index 741e76688cf2..0f2587fa42cb 100644 --- a/Documentation/devicetree/bindings/mfd/max77686.txt +++ b/Documentation/devicetree/bindings/mfd/max77686.txt @@ -19,7 +19,7 @@ Required properties: Example: - max77686: pmic@09 { + max77686: pmic@9 { compatible = "maxim,max77686"; interrupt-parent = <&wakeup_eint>; interrupts = <26 0>; |