Merge tag 'ftracetest-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / sama5d3_can.dtsi

diff --git a/arch/arm/boot/dts/sama5d3_can.dtsi b/arch/arm/boot/dts/sama5d3_can.dtsi
index a0775851cce56d01c696adb65a4cbf2f8dc9d514..eaf41451ad0cf5afec07ab94a03ae9e9a4bdee42 100644 (file)
--- a/arch/arm/boot/dts/sama5d3_can.dtsi
+++ b/arch/arm/boot/dts/sama5d3_can.dtsi
@@ -40,7 +40,7 @@
                                                atmel,clk-output-range = <0 66000000>;
                                        };
 
-                                       can1_clk: can0_clk {
+                                       can1_clk: can1_clk {
                                                #clock-cells = <0>;
                                                reg = <41>;
                                                atmel,clk-output-range = <0 66000000>;