aboutsummaryrefslogtreecommitdiff
path: root/Documentation/devicetree/bindings
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-12-08 11:55:53 +0000
committerMark Brown <broonie@kernel.org>2014-12-08 11:55:53 +0000
commit49c42b458929aa5df4f3df028f34f49ceb1388e8 (patch)
tree29ec6f105a58d9ac38a81814d9a1df7e55ea2bd1 /Documentation/devicetree/bindings
parent11fd101c2ff91afae2e1d79e33caa9f50430ab14 (diff)
parent356a3e1fde11190febb8ace3cdab8694848ed220 (diff)
downloadlinux-linaro-stable-49c42b458929aa5df4f3df028f34f49ceb1388e8.tar.gz
Merge tag 'v3.14.26' into linux-linaro-lsk-v3.14
This is the 3.14.26 stable release
Diffstat (limited to 'Documentation/devicetree/bindings')
-rw-r--r--Documentation/devicetree/bindings/interrupt-controller/interrupts.txt4
1 files changed, 0 insertions, 4 deletions
diff --git a/Documentation/devicetree/bindings/interrupt-controller/interrupts.txt b/Documentation/devicetree/bindings/interrupt-controller/interrupts.txt
index ce6a1a072028..8a3c40829899 100644
--- a/Documentation/devicetree/bindings/interrupt-controller/interrupts.txt
+++ b/Documentation/devicetree/bindings/interrupt-controller/interrupts.txt
@@ -30,10 +30,6 @@ should only be used when a device has multiple interrupt parents.
Example:
interrupts-extended = <&intc1 5 1>, <&intc2 1 0>;
-A device node may contain either "interrupts" or "interrupts-extended", but not
-both. If both properties are present, then the operating system should log an
-error and use only the data in "interrupts".
-
2) Interrupt controller nodes
-----------------------------