diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2013-04-09 01:10:13 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2013-04-09 01:10:13 +0900 |
| commit | da821eb7d42935b0f7056d98c75fd1150f6636f4 (patch) | |
| tree | de83ac171d51bbe7621110c3145a68c198b13711 /arch/arm/boot/dts/kirkwood-ib62x0.dts | |
| parent | 296f3f2c9322480400338f71d8c118107f9a7f20 (diff) | |
| parent | 07961ac7c0ee8b546658717034fe692fd12eefa9 (diff) | |
Merge commit 'v3.9-rc5' into next/clk-exynos
Conflicts:
arch/arm/boot/dts/exynos4.dtsi
arch/arm/boot/dts/exynos5440.dtsi
Diffstat (limited to 'arch/arm/boot/dts/kirkwood-ib62x0.dts')
| -rw-r--r-- | arch/arm/boot/dts/kirkwood-ib62x0.dts | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/kirkwood-ib62x0.dts b/arch/arm/boot/dts/kirkwood-ib62x0.dts index 71902da33d63..5335b1aa8601 100644 --- a/arch/arm/boot/dts/kirkwood-ib62x0.dts +++ b/arch/arm/boot/dts/kirkwood-ib62x0.dts @@ -51,7 +51,6 @@ }; }; serial@12000 { - clock-frequency = <200000000>; status = "okay"; }; |