summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/kirkwood-dns320.dts
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2013-04-25 12:42:42 +0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2013-04-25 12:42:42 +0400
commita126f7c41d80322b42ae0383ed3dcb17ee0296fc (patch)
tree67f3605e72e01f7ec0b15af22d9d7b6ef8598b55 /arch/arm/boot/dts/kirkwood-dns320.dts
parent0098fc39e6d575f940487f09f303787efbc7a373 (diff)
parenta7eb7c6f9a657a01a8359edae31bbeacd18b072c (diff)
downloadlinux-a126f7c41d80322b42ae0383ed3dcb17ee0296fc.tar.xz
Merge branch 'mcpm' of git://git.linaro.org/people/nico/linux into devel-stable
Diffstat (limited to 'arch/arm/boot/dts/kirkwood-dns320.dts')
-rw-r--r--arch/arm/boot/dts/kirkwood-dns320.dts2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/kirkwood-dns320.dts b/arch/arm/boot/dts/kirkwood-dns320.dts
index 5bb0bf39d3b8..c9c44b2f62d7 100644
--- a/arch/arm/boot/dts/kirkwood-dns320.dts
+++ b/arch/arm/boot/dts/kirkwood-dns320.dts
@@ -42,12 +42,10 @@
ocp@f1000000 {
serial@12000 {
- clock-frequency = <166666667>;
status = "okay";
};
serial@12100 {
- clock-frequency = <166666667>;
status = "okay";
};
};