diff options
author | Takashi Iwai <tiwai@suse.de> | 2013-04-03 11:07:29 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2013-04-03 11:07:29 -0400 |
commit | efc33ce197e4b6aaddf1eb2ba6293f51daf3c283 (patch) | |
tree | 9eaceed3c855d5cbc91c2fc247bdcceafbf28cdf /arch/arm/boot/dts/kirkwood-dns325.dts | |
parent | 993884f6a26c6547fa3875f9d3fabdc4250d8da6 (diff) | |
parent | 690a863ff03d9a29ace2b752b8f802fba78a842f (diff) |
Merge branch 'for-linus' into for-next
Back-merge for cleaning up usb-audio code the recent commit modified,
and further UAC2 autoclock patches.
Diffstat (limited to 'arch/arm/boot/dts/kirkwood-dns325.dts')
-rw-r--r-- | arch/arm/boot/dts/kirkwood-dns325.dts | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/kirkwood-dns325.dts b/arch/arm/boot/dts/kirkwood-dns325.dts index d430713ea9b9..e4e4930dc5cf 100644 --- a/arch/arm/boot/dts/kirkwood-dns325.dts +++ b/arch/arm/boot/dts/kirkwood-dns325.dts | |||
@@ -50,7 +50,6 @@ | |||
50 | }; | 50 | }; |
51 | }; | 51 | }; |
52 | serial@12000 { | 52 | serial@12000 { |
53 | clock-frequency = <200000000>; | ||
54 | status = "okay"; | 53 | status = "okay"; |
55 | }; | 54 | }; |
56 | }; | 55 | }; |