diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2013-12-12 10:46:15 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2013-12-12 10:46:15 +0100 |
| commit | 8494bd0e86271fb21581d27e3c5d6a369b5208ca (patch) | |
| tree | 65572b9ad90b016f8fcb7e1964f8536c7dc588f9 /arch/arm/boot/dts/omap-zoom-common.dtsi | |
| parent | d6d63b51fe3bfea0cf596993afa480b0b3b02c32 (diff) | |
| parent | e7d820a5e549b3eb6c3f9467507566565646a669 (diff) | |
| download | talos-op-linux-8494bd0e86271fb21581d27e3c5d6a369b5208ca.tar.gz talos-op-linux-8494bd0e86271fb21581d27e3c5d6a369b5208ca.zip | |
Merge remote-tracking branch 'tip/x86/cpufeature' into kvm-next
Diffstat (limited to 'arch/arm/boot/dts/omap-zoom-common.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/omap-zoom-common.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/omap-zoom-common.dtsi b/arch/arm/boot/dts/omap-zoom-common.dtsi index b0ee342598f0..68221fab978d 100644 --- a/arch/arm/boot/dts/omap-zoom-common.dtsi +++ b/arch/arm/boot/dts/omap-zoom-common.dtsi @@ -13,7 +13,7 @@ * they probably share the same GPIO IRQ * REVISIT: Add timing support from slls644g.pdf */ - 8250@3,0 { + uart@3,0 { compatible = "ns16550a"; reg = <3 0 0x100>; bank-width = <2>; |
