diff options
| author | Jason Cooper <jason@lakedaemon.net> | 2016-09-06 17:20:41 +0300 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2016-09-06 17:20:41 +0300 |
| commit | f61f86068cdf7e59de64d430fd3cc907a8e102f2 (patch) | |
| tree | 36042762aabd59a49afafcacb67bec2fc60627e4 /Documentation/devicetree/bindings/interrupt-controller | |
| parent | 2349f205df22c51fd717cd52b56df0e63c6c3ff2 (diff) | |
| parent | 23299b8c64f8c50e83eb345b835077f3c29588b8 (diff) | |
| download | linux-f61f86068cdf7e59de64d430fd3cc907a8e102f2.tar.xz | |
Merge branch 'irqchip/mvebu64' into irqchip/core
Diffstat (limited to 'Documentation/devicetree/bindings/interrupt-controller')
| -rw-r--r-- | Documentation/devicetree/bindings/interrupt-controller/marvell,odmi-controller.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/interrupt-controller/marvell,odmi-controller.txt b/Documentation/devicetree/bindings/interrupt-controller/marvell,odmi-controller.txt index 8af0a8e613ab..3f6442c7f867 100644 --- a/Documentation/devicetree/bindings/interrupt-controller/marvell,odmi-controller.txt +++ b/Documentation/devicetree/bindings/interrupt-controller/marvell,odmi-controller.txt @@ -31,7 +31,7 @@ Required properties: Example: odmi: odmi@300000 { - compatible = "marvell,ap806-odm-controller", + compatible = "marvell,ap806-odmi-controller", "marvell,odmi-controller"; interrupt-controller; msi-controller; |