diff options
author | Jason Cooper <jason@lakedaemon.net> | 2013-04-15 14:54:05 +0000 |
---|---|---|
committer | Jason Cooper <jason@lakedaemon.net> | 2013-04-15 14:54:05 +0000 |
commit | 3c76a8a95daeecd881718f88324041f6a5faab86 (patch) | |
tree | 89c3d5573e9dbe3a91d533c873562c57ba4b4f2f /arch/arm/boot/dts/kirkwood-dockstar.dts | |
parent | 513a7917b13370d9fbc41331413428dd713cb3fc (diff) | |
parent | 600468d0686096ddc1000c8a2e69475931084414 (diff) | |
download | talos-obmc-linux-3c76a8a95daeecd881718f88324041f6a5faab86.tar.gz talos-obmc-linux-3c76a8a95daeecd881718f88324041f6a5faab86.zip |
Merge tag 'tags/mvebu_fixes_for_v3.9_round3' into mvebu/dt
pulling in mvebu branches which changes armada*.dts? files for LPAE changes
mvebu fixes for v3.9 round 3
- Kirkwood
- a couple of small fixes for the Iomega ix2-200 board (ether and led)
- mvebu
- allow GPIO button to work on Mirabox when running SMP
Diffstat (limited to 'arch/arm/boot/dts/kirkwood-dockstar.dts')
-rw-r--r-- | arch/arm/boot/dts/kirkwood-dockstar.dts | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/kirkwood-dockstar.dts b/arch/arm/boot/dts/kirkwood-dockstar.dts index 2e3dd34e21a5..0196cf6b0ef2 100644 --- a/arch/arm/boot/dts/kirkwood-dockstar.dts +++ b/arch/arm/boot/dts/kirkwood-dockstar.dts @@ -37,7 +37,6 @@ }; }; serial@12000 { - clock-frequency = <200000000>; status = "ok"; }; |