summaryrefslogtreecommitdiff
path: root/arch/arm64
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2016-05-11 17:56:38 +0300
committerIngo Molnar <mingo@kernel.org>2016-05-11 17:56:38 +0300
commitd2950158d0d7bc376503393ca5f73f6f8d27c56b (patch)
tree7daa04400d833bd722258a49d56a39acfb392520 /arch/arm64
parentea7c28518943b26a85d73cd76acd03b71962cb18 (diff)
parente9d848cb65d5f6f7731d12bd1b6d994bfdbcc94f (diff)
downloadlinux-d2950158d0d7bc376503393ca5f73f6f8d27c56b.tar.xz
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm64')
-rw-r--r--arch/arm64/boot/dts/renesas/r8a7795.dtsi1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
index a7315ebe3883..706d2426024f 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
@@ -120,7 +120,6 @@
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <0>;
- status = "disabled";
};
soc {