diff options
| author | Chris Mason <clm@fb.com> | 2014-12-02 21:42:03 -0500 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2014-12-02 21:42:03 -0500 |
| commit | 9627aeee3e203e30679549e4962633698a6bf87f (patch) | |
| tree | 30ee313a7049bf3fcc17e346df5737e967fd9a95 /Documentation/devicetree/bindings/interrupt-controller/interrupts.txt | |
| parent | cb83b7b81698a4abe531e0ba18b9e288b06947ce (diff) | |
| parent | 5d3edd8f44aac94de7b16f4c54290e24f5e8c532 (diff) | |
Merge branch 'raid56-scrub-replace' of git://github.com/miaoxie/linux-btrfs into for-linus
Diffstat (limited to 'Documentation/devicetree/bindings/interrupt-controller/interrupts.txt')
| -rw-r--r-- | Documentation/devicetree/bindings/interrupt-controller/interrupts.txt | 4 |
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. | |||
| 30 | Example: | 30 | Example: |
| 31 | interrupts-extended = <&intc1 5 1>, <&intc2 1 0>; | 31 | interrupts-extended = <&intc1 5 1>, <&intc2 1 0>; |
| 32 | 32 | ||
| 33 | A device node may contain either "interrupts" or "interrupts-extended", but not | ||
| 34 | both. If both properties are present, then the operating system should log an | ||
| 35 | error and use only the data in "interrupts". | ||
| 36 | |||
| 37 | 2) Interrupt controller nodes | 33 | 2) Interrupt controller nodes |
| 38 | ----------------------------- | 34 | ----------------------------- |
| 39 | 35 | ||