summaryrefslogtreecommitdiff
path: root/arch/arm64
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2015-04-02 17:17:46 +0200
committerIngo Molnar <mingo@kernel.org>2015-04-02 17:17:46 +0200
commitc2b078e78ace39710356a7bb6b984177d942a699 (patch)
treee9617aec87d9720e902ce1fca983a955a6104d40 /arch/arm64
parent8062382c8dbe2dc11d37e7f0b139508cf10de9d4 (diff)
parentc420f19b9cdc59662dbb56677417487efc1729ec (diff)
Merge branch 'perf/urgent' into perf/core, before applying dependent patches
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm64')
-rw-r--r--arch/arm64/boot/dts/arm/juno-clocks.dtsi2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/boot/dts/arm/juno-clocks.dtsi b/arch/arm64/boot/dts/arm/juno-clocks.dtsi
index ea2b5666a16f..c9b89efe0f56 100644
--- a/arch/arm64/boot/dts/arm/juno-clocks.dtsi
+++ b/arch/arm64/boot/dts/arm/juno-clocks.dtsi
@@ -8,7 +8,7 @@
*/
/* SoC fixed clocks */
- soc_uartclk: refclk72738khz {
+ soc_uartclk: refclk7273800hz {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <7273800>;