Commit 70f2911e authored by Olof Johansson's avatar Olof Johansson

Merge tag 'renesas-r8a7779-multiplatform3-for-v3.17' of...

Merge tag 'renesas-r8a7779-multiplatform3-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc

Merge "Third Round of Renesas ARM Based SoC r8a7779-multiplatform Updates
for v3.17" from Simon Horman:

- Consistently use tabs for indentation

* tag 'renesas-r8a7779-multiplatform3-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: marzen: Consistently use tabs for indentation
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 84fb69f7 08af6409
......@@ -112,17 +112,17 @@ hspi0_pins: hspi0 {
};
&scif2 {
pinctrl-0 = <&scif2_pins>;
pinctrl-names = "default";
pinctrl-0 = <&scif2_pins>;
pinctrl-names = "default";
status = "okay";
status = "okay";
};
&scif4 {
pinctrl-0 = <&scif4_pins>;
pinctrl-names = "default";
pinctrl-0 = <&scif4_pins>;
pinctrl-names = "default";
status = "okay";
status = "okay";
};
&sdhi0 {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment