diff options
author | Olof Johansson <olof@lixom.net> | 2014-07-13 00:48:50 -0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2014-07-13 00:48:50 -0400 |
commit | 70f2911ee4e66428c52c71c1fa31ff0c7775086e (patch) | |
tree | 8475ded20ad00805fee504d22ae970c3f74b0a89 | |
parent | 84fb69f7dc769e84bfa939a8677ba793aa30d092 (diff) | |
parent | 08af64097d4c5cb17f9df4dadf80ed5f508db743 (diff) |
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: Olof Johansson <olof@lixom.net>
-rw-r--r-- | arch/arm/boot/dts/r8a7779-marzen.dts | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/r8a7779-marzen.dts b/arch/arm/boot/dts/r8a7779-marzen.dts index 20b176807848..5745555df943 100644 --- a/arch/arm/boot/dts/r8a7779-marzen.dts +++ b/arch/arm/boot/dts/r8a7779-marzen.dts | |||
@@ -112,17 +112,17 @@ | |||
112 | }; | 112 | }; |
113 | 113 | ||
114 | &scif2 { | 114 | &scif2 { |
115 | pinctrl-0 = <&scif2_pins>; | 115 | pinctrl-0 = <&scif2_pins>; |
116 | pinctrl-names = "default"; | 116 | pinctrl-names = "default"; |
117 | 117 | ||
118 | status = "okay"; | 118 | status = "okay"; |
119 | }; | 119 | }; |
120 | 120 | ||
121 | &scif4 { | 121 | &scif4 { |
122 | pinctrl-0 = <&scif4_pins>; | 122 | pinctrl-0 = <&scif4_pins>; |
123 | pinctrl-names = "default"; | 123 | pinctrl-names = "default"; |
124 | 124 | ||
125 | status = "okay"; | 125 | status = "okay"; |
126 | }; | 126 | }; |
127 | 127 | ||
128 | &sdhi0 { | 128 | &sdhi0 { |