diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-07-04 16:13:55 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-07-04 16:13:55 -0400 |
| commit | 404c3bc30cb1361e1b3533643326ab472d24a618 (patch) | |
| tree | 156cc9032c8aee17167d926c5bdae009ba8f36d2 /Documentation/devicetree/bindings/tty/serial | |
| parent | 6795a524f0b049ceb5417d5036ab5e233345b900 (diff) | |
| parent | 6887a4131da3adaab011613776d865f4bcfb5678 (diff) | |
Merge commit 'v3.5-rc5' into next
Diffstat (limited to 'Documentation/devicetree/bindings/tty/serial')
| -rw-r--r-- | Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt b/Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt index a9c0406280e8..b462d0c54823 100644 --- a/Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt +++ b/Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt | |||
| @@ -11,7 +11,7 @@ Optional properties: | |||
| 11 | 11 | ||
| 12 | Example: | 12 | Example: |
| 13 | 13 | ||
| 14 | uart@73fbc000 { | 14 | serial@73fbc000 { |
| 15 | compatible = "fsl,imx51-uart", "fsl,imx21-uart"; | 15 | compatible = "fsl,imx51-uart", "fsl,imx21-uart"; |
| 16 | reg = <0x73fbc000 0x4000>; | 16 | reg = <0x73fbc000 0x4000>; |
| 17 | interrupts = <31>; | 17 | interrupts = <31>; |