diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-06-11 11:25:50 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-06-11 11:25:50 +0200 |
commit | 50c0587eedc15235144216f2d2a5bd2a85e03289 (patch) | |
tree | 74f24e52bba71efea51dc8ada3ac5427aa1627e5 /arch/arc/boot/dts/nsimosci.dts | |
parent | 3b290398638ee4e57f1fb2e35c02005cba9a737f (diff) | |
parent | 75d089d12a66a8662d888ff60a9eaea230fed53e (diff) |
Merge branch 'linus' into x86/asm, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arc/boot/dts/nsimosci.dts')
-rw-r--r-- | arch/arc/boot/dts/nsimosci.dts | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arc/boot/dts/nsimosci.dts b/arch/arc/boot/dts/nsimosci.dts index b5b060adce8a..763d66c883da 100644 --- a/arch/arc/boot/dts/nsimosci.dts +++ b/arch/arc/boot/dts/nsimosci.dts @@ -11,7 +11,6 @@ / { compatible = "snps,nsimosci"; - clock-frequency = <20000000>; /* 20 MHZ */ #address-cells = <1>; #size-cells = <1>; interrupt-parent = <&core_intc>; |